diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-10-31 17:02:23 +1300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-11-06 23:35:32 +0000 |
| commit | ebe531b38bea54bd29ed7b3d2ea6c533b9331953 (patch) | |
| tree | ea1cc1b89aff36e1736e92f5110312acf7f0ce28 /meta/classes/npm.bbclass | |
| parent | 6879d524c11b6f0d8920ca9713841d1b0927207f (diff) | |
| download | openembedded-core-contrib-ebe531b38bea54bd29ed7b3d2ea6c533b9331953.tar.gz | |
classes/npm: use npm install to do installation
Using "npm install" instead of "cp -a" is the more correct thing to be
doing here, and ensures that symlinks for executable scripts are put
into ${prefix}/bin. (I'd prefer ${bindir}, but npm does not allow
specifying paths at that level - only a prefix.)
Fixes [YOCTO #10460].
(From OE-Core rev: 90cb980a1c49de99a0aec00c0cd5fc1e165490a7)
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/npm.bbclass')
| -rw-r--r-- | meta/classes/npm.bbclass | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass index fce4c1146f..43228c57d3 100644 --- a/meta/classes/npm.bbclass +++ b/meta/classes/npm.bbclass @@ -33,7 +33,11 @@ npm_do_compile() { npm_do_install() { mkdir -p ${NPM_INSTALLDIR}/ - cp -a ${S}/* ${NPM_INSTALLDIR}/ --no-preserve=ownership + npm install --prefix ${D}${prefix} -g --arch=${NPM_ARCH} --target_arch=${NPM_ARCH} --production --no-registry + if [ -d ${D}${prefix}/etc ] ; then + # This will be empty + rmdir ${D}${prefix}/etc + fi } python populate_packages_prepend () { |