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

Paths for cpu detection

parent 5125030f
No related branches found
No related tags found
No related merge requests found
......@@ -61,10 +61,13 @@ function get_npm_arch {
}
function nodejs_fix_cpu_detection {
# fix for failing cpu detection during image build with qemu, see https://github.com/npm/npm/issues/19265
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.*|1|g" "$rootdir/usr/lib/node_modules/npm/node_modules/worker-farm/lib/farm.js"
fi
if [ -f "$rootdir/.npm-global/lib/node_modules/npm/node_modules/worker-farm/lib/farm.js" ]; then
sed -i "s|require('os').cpus.*|1|g" "$rootdir/.npm-global/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.6.0 --save
}
......@@ -139,6 +142,7 @@ function mesh_install_nodejs {
get_npm_arch
$mesh_install_nodejs_prefix npm config set unsafe-perm true
nodejs_setup_global_modules
nodejs_fix_cpu_detection
$mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g npm@${NPM_VERSION} --save
if [ -f "$rootdir/usr/local/bin/npm" ]; then
......@@ -186,8 +190,6 @@ EOF
fi
rm "$rootdir/usr/bin/test_nodejs_install"
NODE_UPGRADE=
nodejs_setup_global_modules
}
function nodejs_upgrade {
......
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