This fixed our build break issues when including opencv and dev-pkgs in our development image.
Can this be backported to krogoth branch? Acked-by: Lauren Post <[email protected]> -----Original Message----- From: Otavio Salvador [mailto:[email protected]] Sent: Tuesday, May 03, 2016 4:13 PM To: Meta-OpenEmbedded Mailing listing <[email protected]> Cc: Lauren Post <[email protected]>; Otavio Salvador <[email protected]> Subject: [meta-oe master krogoth PATCH v2] opencv: Fix metapkg dependencies for opencv-java and opencv-locales The opencv-java is not always generated so we ought to include it, only if it is available. The opencv-locales is not available and ought to be skipped. Signed-off-by: Otavio Salvador <[email protected]> --- Changes in v2: - Fix handling of package when java support is disabled - Avoids rdepends on -locale packages - Improve commit log meta-oe/recipes-support/opencv/opencv_3.1.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb index c1f9802..789512f 100644 --- a/meta-oe/recipes-support/opencv/opencv_3.1.bb +++ b/meta-oe/recipes-support/opencv/opencv_3.1.bb @@ -79,7 +79,8 @@ export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/" TARGET_CC_ARCH += "-I${S}/include " -PACKAGES += "${PN}-java-dbg ${PN}-java ${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv" +PACKAGES += "${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv \ + ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java-dbg ${PN}-java', '', d)}" python populate_packages_prepend () { cv_libdir = d.expand('${libdir}') @@ -104,7 +105,7 @@ python populate_packages_prepend () { blacklist = [ metapkg ] metapkg_rdepends = [ ] for pkg in packages[1:]: - if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') : + if not pkg in blacklist and not pkg in metapkg_rdepends and not pkg.endswith('-dev') and not pkg.endswith('-dbg') and not pkg.endswith('-doc') and not pkg.endswith('-locale'): metapkg_rdepends.append(pkg) bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) -- 2.8.2 -- _______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
