* [meta-oe master krogoth PATCH v2] opencv: Fix metapkg dependencies for opencv-java and opencv-locales
@ 2016-05-03 21:12 Otavio Salvador
2016-05-04 19:11 ` Lauren Post
0 siblings, 1 reply; 4+ messages in thread
From: Otavio Salvador @ 2016-05-03 21:12 UTC (permalink / raw)
To: Meta-OpenEmbedded Mailing listing; +Cc: Otavio Salvador
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>
---
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(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index c1f9802..789512f 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)
--
2.8.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-oe master krogoth PATCH v2] opencv: Fix metapkg dependencies for opencv-java and opencv-locales
2016-05-03 21:12 [meta-oe master krogoth PATCH v2] opencv: Fix metapkg dependencies for opencv-java and opencv-locales Otavio Salvador
@ 2016-05-04 19:11 ` Lauren Post
2016-05-04 20:50 ` Stiffler, Jacob
2016-05-06 10:57 ` Martin Jansa
0 siblings, 2 replies; 4+ messages in thread
From: Lauren Post @ 2016-05-04 19:11 UTC (permalink / raw)
To: Otavio Salvador, Meta-OpenEmbedded Mailing listing
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 <lauren.post@nxp.com>
-----Original Message-----
From: Otavio Salvador [mailto:otavio@ossystems.com.br]
Sent: Tuesday, May 03, 2016 4:13 PM
To: Meta-OpenEmbedded Mailing listing <openembedded-devel@lists.openembedded.org>
Cc: Lauren Post <lauren.post@nxp.com>; Otavio Salvador <otavio@ossystems.com.br>
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.
Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
---
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(-)
diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
index c1f9802..789512f 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)
--
2.8.2
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [meta-oe master krogoth PATCH v2] opencv: Fix metapkg dependencies for opencv-java and opencv-locales
2016-05-04 19:11 ` Lauren Post
@ 2016-05-04 20:50 ` Stiffler, Jacob
2016-05-06 10:57 ` Martin Jansa
1 sibling, 0 replies; 4+ messages in thread
From: Stiffler, Jacob @ 2016-05-04 20:50 UTC (permalink / raw)
To: openembedded-devel, Otavio Salvador
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.
> -----Original Message-----
> From: openembedded-devel-bounces@lists.openembedded.org
> [mailto:openembedded-devel-bounces@lists.openembedded.org] 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-locales
>
> 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 <lauren.post@nxp.com>
>
> -----Original Message-----
> From: Otavio Salvador [mailto:otavio@ossystems.com.br]
> Sent: Tuesday, May 03, 2016 4:13 PM
> To: Meta-OpenEmbedded Mailing listing <openembedded-
> devel@lists.openembedded.org>
> Cc: Lauren Post <lauren.post@nxp.com>; Otavio Salvador
> <otavio@ossystems.com.br>
> 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.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>
> 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(-)
>
> diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-
> oe/recipes-support/opencv/opencv_3.1.bb
> index c1f9802..789512f 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)
>
> --
> 2.8.2
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [meta-oe master krogoth PATCH v2] opencv: Fix metapkg dependencies for opencv-java and opencv-locales
2016-05-04 19:11 ` Lauren Post
2016-05-04 20:50 ` Stiffler, Jacob
@ 2016-05-06 10:57 ` Martin Jansa
1 sibling, 0 replies; 4+ messages in thread
From: Martin Jansa @ 2016-05-06 10:57 UTC (permalink / raw)
To: openembedded-devel; +Cc: Otavio Salvador
[-- Attachment #1: Type: text/plain, Size: 3039 bytes --]
On Wed, May 04, 2016 at 07:11:05PM +0000, Lauren Post wrote:
> 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 <lauren.post@nxp.com>
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
>
> -----Original Message-----
> From: Otavio Salvador [mailto:otavio@ossystems.com.br]
> Sent: Tuesday, May 03, 2016 4:13 PM
> To: Meta-OpenEmbedded Mailing listing <openembedded-devel@lists.openembedded.org>
> Cc: Lauren Post <lauren.post@nxp.com>; Otavio Salvador <otavio@ossystems.com.br>
> 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.
>
> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br>
> ---
>
> 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(-)
>
> diff --git a/meta-oe/recipes-support/opencv/opencv_3.1.bb b/meta-oe/recipes-support/opencv/opencv_3.1.bb
> index c1f9802..789512f 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)
>
> --
> 2.8.2
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 188 bytes --]
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2016-05-06 10:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2016-05-03 21:12 [meta-oe master krogoth PATCH v2] opencv: Fix metapkg dependencies for opencv-java and opencv-locales Otavio Salvador
2016-05-04 19:11 ` Lauren Post
2016-05-04 20:50 ` Stiffler, Jacob
2016-05-06 10:57 ` Martin Jansa
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.