diff options
| author |   Otavio Salvador <otavio@ossystems.com.br> | 2016-05-03 18:12:36 -0300 |
|---|---|---|
| committer |   Martin Jansa <Martin.Jansa@gmail.com> | 2016-05-06 12:40:26 +0200 |
| commit | 3132af1d1d15209f3512eba8d8885b909b3b13ca (patch) | |
| tree | d627665cb7ca02b64c6fd5f28fd4792559ff0b1b | |
| parent | 5bece73f64ae7f736cd08eef387d67d74e31a424 (diff) | |
| download | meta-openembedded-contrib-3132af1d1d15209f3512eba8d8885b909b3b13ca.tar.gz | |
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 <otavio@ossystems.com.br>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
| -rw-r--r-- | meta-oe/recipes-support/opencv/opencv_3.1.bb | 5 |
1 files 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 c1f9802627..789512f9e0 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) |