From 33874df953a425481806fb4b44a0ab78ab075b94 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Fri, 6 May 2016 11:00:56 -0300 Subject: 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 Signed-off-by: Martin Jansa Signed-off-by: Armin Kuster --- 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 c1f980262..789512f9e 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) -- cgit v1.2.3-54-g00ecf