Skip to contentSkip to conversation

nodejs_16.11.1.bb: only handle npm if configured

PATCH In review Nisha Parrakat 3 participants 3 messages Jan 11, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 nodejs_16.11.1.bb: only handle npm if configured

npm-cli.js should be symlinked only when the file is present the file may not be available if the configure option is --without-npm

---
 meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb +6 -3
index 11034420a..c8d942538 100644
@@ -175,8 +175,9 @@ do_install:append:class-native() {
     # /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js
     # use sed on npm-cli.js because otherwise symlink is replaced with normal file and
     # npm-cli.js continues to use old shebang
-    sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
-
+    if [[ -f "${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js" ]]; then
+        sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+    fi
     # 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
@@ -189,7 +190,9 @@ do_install:append:class-native() {
 }
 
 do_install:append:class-target() {
-    sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+    if [[ -f "${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js" ]]; then
+        sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+    fi
 }
 
 PACKAGES =+ "${PN}-npm"
Signature · 1 line
2.17.1
#1 lore raw

That needs to go to the [email protected] as nodejs isn't part of core

Quoted 43 lines · Nisha Parrakat
---
  meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb | 9 ++++++---
  1 file changed, 6 insertions(+), 3 deletions(-)
meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb +6 -4
index 11034420a..c8d942538 100644
@@ -175,8 +175,9 @@ do_install:append:class-native() {
      # /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js
      # use sed on npm-cli.js because otherwise symlink is replaced with normal file and
      # npm-cli.js continues to use old shebang
-    sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
-
+    if [[ -f "${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js" ]]; then
+        sed "1s^.*^#\!/usr/bin/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+    fi
      # 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
@@ -189,7 +190,9 @@ do_install:append:class-native() {
  }
 
  do_install:append:class-target() {
-    sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+    if [[ -f "${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js" ]]; then
+        sed "1s^.*^#\!${bindir}/env node^g" -i ${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+    fi
  }
 
  PACKAGES =+ "${PN}-npm"
 
 
 
-=-=-=-=-=-=-=-=-=-=-=-

Links: You receive all messages sent to this group.
View/Reply Online (#160418): https://lists.openembedded.org/g/openembedded-core/message/160418
Mute This Topic: https://lists.openembedded.org/mt/88352467/3647476
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub [[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-

#2 lore raw
In reply to Nisha Parrakat

This needs to go into openembedded-devel mailing list so it can be picked by lore and other tools

Quoted 48 lines · Nisha Parrakat

npm-cli.js should be symlinked only when the file is present the file may not be available if the configure option is --without-npm

---
 meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)
meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb +0 -0
index 11034420a..c8d942538 100644
@@ -175,8 +175,9 @@ do_install:append:class-native() {
     # /usr/bin/npm is symlink to /usr/lib/node_modules/npm/bin/npm-cli.js
     # use sed on npm-cli.js because otherwise symlink is replaced with

normal file and

     # npm-cli.js continues to use old shebang
-    sed "1s^.*^#\!/usr/bin/env node^g" -i
${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb +1 -1
-
+    if [[ -f "${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js" ]];

then
+ sed "1s^.*^#\!/usr/bin/env node^g" -i
${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+ fi
# 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
meta-oe/recipes-devtools/nodejs/nodejs_16.11.1.bb +0 -1
@@ -189,7 +190,9 @@ do_install:append:class-native() {
 }
 
 do_install:append:class-target() {
-    sed "1s^.*^#\!${bindir}/env node^g" -i

${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+ if [[ -f "${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js" ]];
then
+ sed "1s^.*^#\!${bindir}/env node^g" -i
${D}${exec_prefix}/lib/node_modules/npm/bin/npm-cli.js
+ fi
}

PACKAGES =+ "${PN}-npm"
--
2.17.1