[oe] [meta-oe master krogoth PATCH v2] opencv: Fix metapkg dependencies for opencv-java and opencv-locales

[Martin Jansa]

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 at 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 at ossystems.com.br] 
> Sent: Tuesday, May 03, 2016 4:13 PM
> To: Meta-OpenEmbedded Mailing listing <openembedded-devel at lists.openembedded.org>
> Cc: Lauren Post <lauren.post at nxp.com>; Otavio Salvador <otavio at 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 at 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 at lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel

-- 
Martin 'JaMa' Jansa     jabber: Martin.Jansa at gmail.com
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 181 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20160506/deafeaf0/attachment-0002.sig>