Skip to content
Snippets Groups Projects
Commit 9dc754bc authored by Bob Mottram's avatar Bob Mottram
Browse files

Fix for failing cpu detection during build

parent 608010de
No related branches found
No related tags found
No related merge requests found
......@@ -37,7 +37,7 @@ VARIANTS='mesh'
# have specifically the correct versions
NODEJS_VERSION='8.11.1'
NODEJS_N_VERSION='2.1.7'
NPM_VERSION='5.8.0'
NPM_VERSION='5.6.0'
# This file keeps track of the apps needing nodejs
# so that it can be removed if tere are no apps which need it
......@@ -130,6 +130,10 @@ function mesh_install_nodejs {
get_npm_arch
$mesh_install_nodejs_prefix npm config set unsafe-perm true
if [ -f "$rootdir/usr/lib/node_modules/npm/node_modules/worker-farm/lib/farm.js" ]; then
# fix for failing cpu detection during image build with qemu, see https://github.com/npm/npm/issues/19265
sed -i "s|require('os').cpus().length|1|g" "$rootdir/usr/lib/node_modules/npm/node_modules/worker-farm/lib/farm.js"
fi
$mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g npm@${NPM_VERSION} --save
if [ -f "$rootdir/usr/local/bin/npm" ]; then
cp "$rootdir/usr/local/bin/npm" /usr/bin/npm
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment