opencv: Fix metapkg dependencies for opencv-java and opencv-locales
PATCH v2 1/1 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.
---
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(-)
meta-oe/recipes-support/opencv/opencv_3.1.bb +3 -2
@@ -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)
Signature · 1 line
2.8.2
This fixed our build break issues when including opencv and dev-pkgs in our development image.
Can this be backported to krogoth branch?
-----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.
---
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(-)
meta-oe/recipes-support/opencv/opencv_3.1.bb +3 -2
@@ -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
I missed this patch, and recently sent a similar one with the subject " opencv: Fix broken deps for opencv meta package".
It would be great if this could be backported to krogoth.
Quoted 80 lines
-----Original Message-----
From: [email protected] [mailto:[email protected]] On Behalf Of Lauren Post
Sent: Wednesday, May 04, 2016 3:11 PM
To: Otavio Salvador; Meta-OpenEmbedded Mailing listing
Subject: Re: [oe] [meta-oe master krogoth PATCH v2] opencv: Fix metapkg dependencies for opencv-java and opencv-localesThis 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 <openembedded- [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-localesThe 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 logmeta-oe/recipes-support/opencv/opencv_3.1.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)meta- renamed from meta-oe/recipes-support/opencv/opencv_3.1.bb +0
-0oe/recipes-support/opencv/opencv_3.1.bb
index c1f9802..789512f 100644meta-oe/recipes-support/opencv/opencv_3.1.bb +0
-0@@ -79,7 +79,8 @@ exportANT_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}')meta-oe/recipes-support/opencv/opencv_3.1.bb +0
-1@@ -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 notpkg.endswith('-dbg')and notpkg.endswith('- doc'):
+ if not pkg in blacklist and not pkg inmetapkg_rdependsand notpkg.endswith('-dev')and notpkg.endswith('-dbg')and notpkg.endswith('- doc')and notpkg.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
Quoted 5 lines · Lauren Post
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]>
I've merged the version from master-next today (not sure if it was V2 or V1) can someone please test it and if anything is missing (from the other review as well) send follow-up patch?
Thanks
Quoted 52 lines
-----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-localesThe 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 logmeta-oe/recipes-support/opencv/opencv_3.1.bb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)meta-oe/recipes-support/opencv/opencv_3.1.bb +3
-3@@ -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
Signature · 4 lines
_______________________________________________ Openembedded-devel mailing list [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
Signature · 1 line
Martin 'JaMa' Jansa jabber: [email protected]