diff options
author | Böszörményi Zoltán <zboszor@pr.hu> | 2018-02-01 14:08:30 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-02-06 10:54:34 +0000 |
commit | 2d7d2a460842c8747df17990970f22f4a11f36f6 (patch) | |
tree | e3f530be3d0e949f0fb2f65e794bc5698bd2a858 /meta/classes | |
parent | aa168ee7f785ff007ca645db57698883922b5eb3 (diff) | |
download | openembedded-core-2d7d2a460842c8747df17990970f22f4a11f36f6.tar.gz openembedded-core-2d7d2a460842c8747df17990970f22f4a11f36f6.tar.bz2 openembedded-core-2d7d2a460842c8747df17990970f22f4a11f36f6.zip |
npm.bbclass: Fix building node modules with npm@5
npm cache clear throws an error with npm@5 and suggests to
use npm cache verify instead. But our cache is actually empty,
so use npm cache clear --force.
npm install in the source directory creates symlinks with npm@5.
Use a combination of npm pack and npm install module-version.tgz
that works the same way with older and new npm versions and is
guaranteed to create actual copies instead of directory symlinks.
This change allows using nodejs 8.x LTS, tested with 8.9.4.
Signed-off-by: Zoltán Böszörményi <zboszor@pr.hu>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/npm.bbclass | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/classes/npm.bbclass b/meta/classes/npm.bbclass index a69bedbb28..898a54eb50 100644 --- a/meta/classes/npm.bbclass +++ b/meta/classes/npm.bbclass @@ -31,7 +31,7 @@ npm_do_compile() { fi npm set cache ${WORKDIR}/npm_cache # clear cache before every build - npm cache clear + npm cache clear --force # Install pkg into ${S} without going to the registry if [ "${NPM_INSTALL_DEV}" = "1" ]; then npm --arch=${NPM_ARCH} --target_arch=${NPM_ARCH} --no-registry install @@ -45,7 +45,8 @@ npm_do_install() { # be created in this directory export HOME=${WORKDIR} mkdir -p ${NPM_INSTALLDIR}/ - npm install --prefix ${D}${prefix} -g --arch=${NPM_ARCH} --target_arch=${NPM_ARCH} --production --no-registry + npm pack . + npm install --prefix ${D}${prefix} -g --arch=${NPM_ARCH} --target_arch=${NPM_ARCH} --production --no-registry ${PN}-${PV}.tgz if [ -d ${D}${prefix}/etc ] ; then # This will be empty rmdir ${D}${prefix}/etc |