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

Tidying

parent 11578109
No related branches found
No related tags found
No related merge requests found
......@@ -65,6 +65,8 @@ function nodejs_fix_cpu_detection {
# fix for failing cpu detection during image build with qemu, see https://github.com/npm/npm/issues/19265
sed -i "s|require('os').cpus.*|1|g" "$rootdir/usr/lib/node_modules/npm/node_modules/worker-farm/lib/farm.js"
fi
# installing worker farm fixes the cpu detection bug
$mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g worker-farm@1.5.2 --save
}
function mesh_install_nodejs {
......@@ -138,8 +140,6 @@ function mesh_install_nodejs {
$mesh_install_nodejs_prefix npm config set unsafe-perm true
nodejs_fix_cpu_detection
# installing worker farm fixes the cpu detection bug
$mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g worker-farm@1.5.2 --save
$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