]> git.ipfire.org Git - thirdparty/openembedded/openembedded-core-contrib.git/commitdiff
npm.bbclass: Don't create /usr/lib/node symlink
authorZoltán Böszörményi <zboszor@gmail.com>
Fri, 13 May 2022 15:30:30 +0000 (17:30 +0200)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Sun, 15 May 2022 07:57:09 +0000 (08:57 +0100)
When a recipe DEPENDS on multiple other npm based recipes,
the symlink will create a conflict.

Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/classes/npm.bbclass

index 86ee0f665aad3253e6f6415a144d1a717425b1cc..dbfc2e728e7b97baaac71a7053c12b3162a70777 100644 (file)
@@ -307,10 +307,6 @@ npm_do_install() {
     # Remove the shrinkwrap file which does not need to be packed
     rm -f ${D}/${nonarch_libdir}/node_modules/*/npm-shrinkwrap.json
     rm -f ${D}/${nonarch_libdir}/node_modules/@*/*/npm-shrinkwrap.json
-
-    # node(1) is using /usr/lib/node as default include directory and npm(1) is
-    # using /usr/lib/node_modules as install directory. Let's make both happy.
-    ln -fs node_modules ${D}/${nonarch_libdir}/node
 }
 
 FILES:${PN} += " \