From 0a4faceed66002ca04413f69f6b422197981cedf Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 21 Jan 2020 22:28:33 -0800 Subject: [PATCH] nodejs: Build only when meta-py2 is included Signed-off-by: Khem Raj --- meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 3 ++- meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb index 6dda3005e7..60276468fd 100644 --- a/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb +++ b/meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb @@ -113,13 +113,14 @@ RDEPENDS_packagegroup-meta-oe-devtools ="\ giflib icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \ kconfig-frontends lemon libedit libgee libsombok3 \ libubox log4cplus lshw ltrace lua mcpp memstat mercurial \ - mpich msgpack-c nlohmann-json nodejs openocd pax-utils \ + mpich msgpack-c nlohmann-json openocd pax-utils \ ipc-run libdbd-mysql-perl libdbi-perl libio-pty-perl php \ protobuf protobuf-c python3-distutils-extra \ python-cpuset python-distutils-extra python-futures python-pygobject \ rapidjson serialcheck sip3 sip tclap uftrace uw-imap valijson \ xmlrpc-c yajl yasm \ ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany geany-plugins glade tk", "", d)} \ + ${@bb.utils.contains("BBPATH", "meta-python2", "nodejs", "", d)} \ " RDEPENDS_packagegroup-meta-oe-devtools_remove_armv5 = "uftrace nodejs" diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb index a9ca58f8bc..b52f198bd3 100644 --- a/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb +++ b/meta-oe/recipes-devtools/nodejs/nodejs_10.17.0.bb @@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=be980eb7ccafe287cb438076a65e888c" DEPENDS = "openssl" DEPENDS_append_class-target = " nodejs-native" -inherit pkgconfig python3native +inherit pkgconfig pythonnative COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" @@ -148,3 +148,8 @@ FILES_${PN}-systemtap = "${datadir}/systemtap" BBCLASSEXTEND = "native" + +python() { + if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): + raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') +}