summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-support/opencv/opencv_3.1.bb
diff options
context:
space:
mode:
Diffstat (limited to 'meta-oe/recipes-support/opencv/opencv_3.1.bb')
-rw-r--r--meta-oe/recipes-support/opencv/opencv_3.1.bb5
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 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/"
79 79
80TARGET_CC_ARCH += "-I${S}/include " 80TARGET_CC_ARCH += "-I${S}/include "
81 81
82PACKAGES += "${PN}-java-dbg ${PN}-java ${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv" 82PACKAGES += "${PN}-samples-dbg ${PN}-samples ${PN}-apps python-opencv \
83 ${@bb.utils.contains('PACKAGECONFIG', 'oracle-java', '${PN}-java-dbg ${PN}-java', '', d)}"
83 84
84python populate_packages_prepend () { 85python populate_packages_prepend () {
85 cv_libdir = d.expand('${libdir}') 86 cv_libdir = d.expand('${libdir}')
@@ -104,7 +105,7 @@ python populate_packages_prepend () {
104 blacklist = [ metapkg ] 105 blacklist = [ metapkg ]
105 metapkg_rdepends = [ ] 106 metapkg_rdepends = [ ]
106 for pkg in packages[1:]: 107 for pkg in packages[1:]:
107 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') : 108 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'):
108 metapkg_rdepends.append(pkg) 109 metapkg_rdepends.append(pkg)
109 bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) 110 bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)
110 111