diff options
author | Zoltán Böszörményi <zboszor@gmail.com> | 2022-05-13 17:30:30 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-05-15 08:57:15 +0100 |
commit | 96f4a89d8d82c6663a537dec43011190ac395e3a (patch) | |
tree | b7620b9072963a7eee793787c94afcdf92cfe5ce /meta | |
parent | 1d0fc713e8a583ee5c542f6188ad30d823359b41 (diff) | |
download | poky-96f4a89d8d82c6663a537dec43011190ac395e3a.tar.gz |
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.
(From OE-Core rev: 9896a7e3a9bdbc6bf3bb67b5f5d5c8ae8225ed0f)
Signed-off-by: Zoltán Böszörményi <zboszor@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r-- | meta/classes/npm.bbclass | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass index 86ee0f665a..dbfc2e728e 100644 --- a/meta/classes/npm.bbclass +++ b/meta/classes/npm.bbclass | |||
@@ -307,10 +307,6 @@ npm_do_install() { | |||
307 | # Remove the shrinkwrap file which does not need to be packed | 307 | # Remove the shrinkwrap file which does not need to be packed |
308 | rm -f ${D}/${nonarch_libdir}/node_modules/*/npm-shrinkwrap.json | 308 | rm -f ${D}/${nonarch_libdir}/node_modules/*/npm-shrinkwrap.json |
309 | rm -f ${D}/${nonarch_libdir}/node_modules/@*/*/npm-shrinkwrap.json | 309 | rm -f ${D}/${nonarch_libdir}/node_modules/@*/*/npm-shrinkwrap.json |
310 | |||
311 | # node(1) is using /usr/lib/node as default include directory and npm(1) is | ||
312 | # using /usr/lib/node_modules as install directory. Let's make both happy. | ||
313 | ln -fs node_modules ${D}/${nonarch_libdir}/node | ||
314 | } | 310 | } |
315 | 311 | ||
316 | FILES:${PN} += " \ | 312 | FILES:${PN} += " \ |