[oe] [meta-oe][PATCH v2] mraa/upm: enable nodejs bindings by default

[Martin Jansa]

On Tue, Oct 17, 2017 at 01:35:15PM +0300, Mikko Ylinen wrote:
> HAVE_NODEJS is a leftover from meta-refkit-core where the
> layer had to adapt to different BBLAYER combinations (some
> where nodejs wasn't available but mraa/upm were).
> 
> Since that check is no longer needed and nodejs is in fact
> part of meta-oe, nodejs bindings can be enabled by default
> (with an exception for qemuarm/armv5 where nodejs isn't
> available).
> 
> Signed-off-by: Mikko Ylinen <mikko.ylinen at linux.intel.com>
> ---
>  meta-oe/recipes-extended/mraa/mraa_git.bb | 5 ++++-
>  meta-oe/recipes-extended/upm/upm_git.bb   | 5 ++++-
>  2 files changed, 8 insertions(+), 2 deletions(-)
> 
> diff --git a/meta-oe/recipes-extended/mraa/mraa_git.bb b/meta-oe/recipes-extended/mraa/mraa_git.bb
> index 616048fac..b22691ca4 100644
> --- a/meta-oe/recipes-extended/mraa/mraa_git.bb
> +++ b/meta-oe/recipes-extended/mraa/mraa_git.bb
> @@ -31,7 +31,10 @@ FILES_${PN}-utils = "${bindir}/"
>  # override this in local.conf to get needed bindings.
>  # BINDINGS_pn-mraa="python"
>  # will result in only the python bindings being built/packaged.
> -BINDINGS ??= "python ${@ 'nodejs' if oe.types.boolean(d.getVar('HAVE_NODEJS') or '0') else '' }"
> +BINDINGS ??= "python nodejs"
> +
> +# nodejs isn't available for armv5 architecture
> +BINDINGS_qemuarm ??= "python"

qemuarm isn't the only armv4 and armv5 MACHINE OE supports, use the same
3 overrides nodejs recipe is using.

>  PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \
>   ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}"
> diff --git a/meta-oe/recipes-extended/upm/upm_git.bb b/meta-oe/recipes-extended/upm/upm_git.bb
> index 38065ce53..eea5ae80a 100644
> --- a/meta-oe/recipes-extended/upm/upm_git.bb
> +++ b/meta-oe/recipes-extended/upm/upm_git.bb
> @@ -26,7 +26,10 @@ inherit distutils3-base cmake
>  # override this in local.conf to get needed bindings.
>  # BINDINGS_pn-upm="python"
>  # will result in only the python bindings being built/packaged.
> -BINDINGS ??= "python ${@ 'nodejs' if oe.types.boolean(d.getVar('HAVE_NODEJS') or '0') else '' }"
> +BINDINGS ??= "python nodejs"
> +
> +# nodejs isn't available for armv5 architecture
> +BINDINGS_qemuarm ??= "python"
>  
>  PACKAGECONFIG ??= "${@bb.utils.contains('PACKAGES', 'node-${PN}', 'nodejs', '', d)} \
>   ${@bb.utils.contains('PACKAGES', '${PYTHON_PN}-${PN}', 'python', '', d)}"
> -- 
> 2.11.0
> 
> -- 
> _______________________________________________
> 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: 195 bytes
Desc: Digital signature
URL: <http://lists.openembedded.org/pipermail/openembedded-devel/attachments/20171017/5bb1ba82/attachment-0002.sig>