free
/
freedombone
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Paths for cpu detection

This commit is contained in:
Bob Mottram 2018-04-02 22:52:32 +01:00
parent 5125030fca
commit c29e754b22
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/freedombone-utils-nodejs
View File

@ -61,10 +61,13 @@ function get_npm_arch {
} }
function nodejs_fix_cpu_detection { 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 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" sed -i "s|require('os').cpus.*|1|g" "$rootdir/usr/lib/node_modules/npm/node_modules/worker-farm/lib/farm.js"
fi 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 # installing worker farm fixes the cpu detection bug
$mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g worker-farm@1.6.0 --save $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 get_npm_arch
$mesh_install_nodejs_prefix npm config set unsafe-perm true $mesh_install_nodejs_prefix npm config set unsafe-perm true
nodejs_setup_global_modules
nodejs_fix_cpu_detection nodejs_fix_cpu_detection
$mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g npm@${NPM_VERSION} --save $mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g npm@${NPM_VERSION} --save
if [ -f "$rootdir/usr/local/bin/npm" ]; then if [ -f "$rootdir/usr/local/bin/npm" ]; then
@ -186,8 +190,6 @@ EOF
fi fi
rm "$rootdir/usr/bin/test_nodejs_install" rm "$rootdir/usr/bin/test_nodejs_install"
NODE_UPGRADE= NODE_UPGRADE=
nodejs_setup_global_modules
} }
function nodejs_upgrade { function nodejs_upgrade {