From: Zoltán Böszörményi <zboszor@gmail.com>
Date: Fri, 13 May 2022 15:30:30 +0000 (+0200)
Subject: npm.bbclass: Don't create /usr/lib/node symlink
X-Git-Tag: lucaceresoli/bug-15201-perf-libtraceevent-missing~4138
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9896a7e3a9bdbc6bf3bb67b5f5d5c8ae8225ed0f;p=thirdparty%2Fopenembedded%2Fopenembedded-core-contrib.git

npm.bbclass: Don't create /usr/lib/node symlink

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>
---

diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass
index 86ee0f665aa..dbfc2e728e7 100644
--- a/meta/classes/npm.bbclass
+++ b/meta/classes/npm.bbclass
@@ -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} += " \