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

Fix for failing cpu detection during build

This commit is contained in:
Bob Mottram 2018-04-02 15:05:58 +01:00
parent 608010de34
commit 9dc754bc96
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/freedombone-utils-nodejs
View File

@ -37,7 +37,7 @@ VARIANTS='mesh'
# have specifically the correct versions # have specifically the correct versions
NODEJS_VERSION='8.11.1' NODEJS_VERSION='8.11.1'
NODEJS_N_VERSION='2.1.7' 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 # This file keeps track of the apps needing nodejs
# so that it can be removed if tere are no apps which need it # 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 get_npm_arch
$mesh_install_nodejs_prefix npm config set unsafe-perm true $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 $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
cp "$rootdir/usr/local/bin/npm" /usr/bin/npm cp "$rootdir/usr/local/bin/npm" /usr/bin/npm