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 exceptions for armv4 and armv5 where nodejs isn't available). Signed-off-by: Mikko Ylinen <[email protected]> --- meta-oe/recipes-extended/mraa/mraa_git.bb | 6 +++++- meta-oe/recipes-extended/upm/upm_git.bb | 6 +++++- 2 files changed, 10 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..b93fd72c8 100644 --- a/meta-oe/recipes-extended/mraa/mraa_git.bb +++ b/meta-oe/recipes-extended/mraa/mraa_git.bb @@ -31,7 +31,11 @@ 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 armv4/armv5 architectures +BINDINGS_armv4 ??= "python" +BINDINGS_armv5 ??= "python" 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..da1e4add5 100644 --- a/meta-oe/recipes-extended/upm/upm_git.bb +++ b/meta-oe/recipes-extended/upm/upm_git.bb @@ -26,7 +26,11 @@ 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 armv4/armv5 architectures +BINDINGS_armv4 ??= "python" +BINDINGS_armv5 ??= "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 [email protected] http://lists.openembedded.org/mailman/listinfo/openembedded-devel
