diff options
author | Khem Raj <raj.khem@gmail.com> | 2020-01-21 22:28:33 -0800 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-01-22 09:56:35 -0800 |
commit | 0a4faceed66002ca04413f69f6b422197981cedf (patch) | |
tree | 5b0467cf0bee691c41f5bd366008270b6cdb6617 | |
parent | 2b67b882ee6c7c49b506e283988d115493a1ce9d (diff) | |
download | meta-openembedded-0a4faceed66002ca04413f69f6b422197981cedf.tar.gz |
nodejs: Build only when meta-py2 is included
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-oe/recipes-core/packagegroups/packagegroup-meta-oe.bb | 3 | ||||
-rw-r--r-- | 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 ="\ | |||
113 | giflib icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \ | 113 | giflib icon-slicer iptraf-ng jq jsoncpp jsonrpc json-spirit \ |
114 | kconfig-frontends lemon libedit libgee libsombok3 \ | 114 | kconfig-frontends lemon libedit libgee libsombok3 \ |
115 | libubox log4cplus lshw ltrace lua mcpp memstat mercurial \ | 115 | libubox log4cplus lshw ltrace lua mcpp memstat mercurial \ |
116 | mpich msgpack-c nlohmann-json nodejs openocd pax-utils \ | 116 | mpich msgpack-c nlohmann-json openocd pax-utils \ |
117 | ipc-run libdbd-mysql-perl libdbi-perl libio-pty-perl php \ | 117 | ipc-run libdbd-mysql-perl libdbi-perl libio-pty-perl php \ |
118 | protobuf protobuf-c python3-distutils-extra \ | 118 | protobuf protobuf-c python3-distutils-extra \ |
119 | python-cpuset python-distutils-extra python-futures python-pygobject \ | 119 | python-cpuset python-distutils-extra python-futures python-pygobject \ |
120 | rapidjson serialcheck sip3 sip tclap uftrace uw-imap valijson \ | 120 | rapidjson serialcheck sip3 sip tclap uftrace uw-imap valijson \ |
121 | xmlrpc-c yajl yasm \ | 121 | xmlrpc-c yajl yasm \ |
122 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany geany-plugins glade tk", "", d)} \ | 122 | ${@bb.utils.contains("DISTRO_FEATURES", "x11", "geany geany-plugins glade tk", "", d)} \ |
123 | ${@bb.utils.contains("BBPATH", "meta-python2", "nodejs", "", d)} \ | ||
123 | " | 124 | " |
124 | 125 | ||
125 | RDEPENDS_packagegroup-meta-oe-devtools_remove_armv5 = "uftrace nodejs" | 126 | 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" | |||
6 | DEPENDS = "openssl" | 6 | DEPENDS = "openssl" |
7 | DEPENDS_append_class-target = " nodejs-native" | 7 | DEPENDS_append_class-target = " nodejs-native" |
8 | 8 | ||
9 | inherit pkgconfig python3native | 9 | inherit pkgconfig pythonnative |
10 | 10 | ||
11 | COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" | 11 | COMPATIBLE_MACHINE_armv4 = "(!.*armv4).*" |
12 | COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" | 12 | COMPATIBLE_MACHINE_armv5 = "(!.*armv5).*" |
@@ -148,3 +148,8 @@ FILES_${PN}-systemtap = "${datadir}/systemtap" | |||
148 | 148 | ||
149 | 149 | ||
150 | BBCLASSEXTEND = "native" | 150 | BBCLASSEXTEND = "native" |
151 | |||
152 | python() { | ||
153 | if 'meta-python2' not in d.getVar('BBFILE_COLLECTIONS').split(): | ||
154 | raise bb.parse.SkipRecipe('Requires meta-python2 to be present.') | ||
155 | } | ||