mirrors/meta-openembedded
1
0
Fork 0
mirror of https://github.com/openembedded/meta-openembedded.git synced 2026-04-20 11:38:34 +00:00
Code Issues Projects Releases Wiki Activity

opencv: Fix metapkg dependencies for opencv-java and opencv-locales

Browse Source 
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>
This commit is contained in:
Otavio Salvador
2016-05-03 18:12:36 -03:00
committed by Martin Jansa
parent 5bece73f64
commit 3132af1d1d
1 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
meta-oe/recipes-support/opencv/opencv_3.1.bb
View File

@@ -79,7 +79,8 @@ export ANT_DIR="${STAGING_DIR_NATIVE}/usr/share/ant/"
TARGET_CC_ARCH += "-I${S}/include " 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 () { python populate_packages_prepend () {
cv_libdir = d.expand('${libdir}') cv_libdir = d.expand('${libdir}')
@@ -104,7 +105,7 @@ python populate_packages_prepend () {
blacklist = [ metapkg ] blacklist = [ metapkg ]
metapkg_rdepends = [ ] metapkg_rdepends = [ ]
for pkg in packages[1:]: 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) metapkg_rdepends.append(pkg)
bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d) bb.data.setVar('RDEPENDS_' + metapkg, ' '.join(metapkg_rdepends), d)