aboutsummaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorPeter Kjellerstedt <peter.kjellerstedt@axis.com>2022-01-14 14:22:15 +0100
committerKhem Raj <raj.khem@gmail.com>2022-01-18 09:01:51 -0800
commit3670d61546bfce46f27ce52def370a69eb499f42 (patch)
treeaba75337d6ff4b43bd81aaf83f749f2fb8229d1a /meta-oe
parenta7fd038743aec62af4212547abaff17ad0d2e11a (diff)
downloadmeta-openembedded-contrib-3670d61546bfce46f27ce52def370a69eb499f42.tar.gz
meta-openembedded-contrib-3670d61546bfce46f27ce52def370a69eb499f42.tar.bz2
meta-openembedded-contrib-3670d61546bfce46f27ce52def370a69eb499f42.zip
nodejs: A little clean up
* The destination file name does not need to be specified to install if it matches the source file name (and -D is not used). * Mode 0755 does not need to be specified to install as it is the default. Signed-off-by: Peter Kjellerstedt <peter.kjellerstedt@axis.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb20
1 files changed, 11 insertions, 9 deletions
diff --git a/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb b/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb
index 318cb961f8..72fbecb8fb 100644
--- a/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb
+++ b/meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb
@@ -151,7 +151,7 @@ do_configure () {
do_compile () {
export LD="${CXX}"
- install -Dm 0755 ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh
+ install -D ${B}/v8-qemu-wrapper.sh ${B}/out/Release/v8-qemu-wrapper.sh
oe_runmake BUILDTYPE=Release
}
@@ -159,20 +159,22 @@ do_install () {
oe_runmake install DESTDIR=${D}
}
+BINARIES = " \
+ bytecode_builtins_list_generator \
+ ${@bb.utils.contains('PACKAGECONFIG', 'icu', 'gen-regexp-special-case', '', d)} \
+ mkcodecache \
+ node_mksnapshot \
+ torque \
+"
+
do_install:append:class-native() {
# Install the native binaries to provide it within sysroot for the target compilation
install -d ${D}${bindir}
- install -m 0755 ${S}/out/Release/torque ${D}${bindir}/torque
- install -m 0755 ${S}/out/Release/bytecode_builtins_list_generator ${D}${bindir}/bytecode_builtins_list_generator
- if ${@bb.utils.contains('PACKAGECONFIG','icu','true','false',d)}; then
- install -m 0755 ${S}/out/Release/gen-regexp-special-case ${D}${bindir}/gen-regexp-special-case
- fi
- install -m 0755 ${S}/out/Release/mkcodecache ${D}${bindir}/mkcodecache
- install -m 0755 ${S}/out/Release/node_mksnapshot ${D}${bindir}/node_mksnapshot
+ (cd ${S}/out/Release && install ${BINARIES} ${D}${bindir})
}
PACKAGES =+ "${PN}-npm"
-FILES:${PN}-npm = "${exec_prefix}/lib/node_modules ${bindir}/npm ${bindir}/npx"
+FILES:${PN}-npm = "${nonarch_libdir}/node_modules ${bindir}/npm ${bindir}/npx"
RDEPENDS:${PN}-npm = "bash python3-core python3-shell python3-datetime \
python3-misc python3-multiprocessing"