소스 검색

Fix for failing cpu detection during build

Bob Mottram 7 년 전
부모
커밋
9dc754bc96
1개의 변경된 파일5개의 추가작업 그리고 1개의 파일을 삭제
  1. 5
    1
      src/freedombone-utils-nodejs

+ 5
- 1
src/freedombone-utils-nodejs 파일 보기

@@ -37,7 +37,7 @@ VARIANTS='mesh'
37 37
 # have specifically the correct versions
38 38
 NODEJS_VERSION='8.11.1'
39 39
 NODEJS_N_VERSION='2.1.7'
40
-NPM_VERSION='5.8.0'
40
+NPM_VERSION='5.6.0'
41 41
 
42 42
 # This file keeps track of the apps needing nodejs
43 43
 # so that it can be removed if tere are no apps which need it
@@ -130,6 +130,10 @@ function mesh_install_nodejs {
130 130
     get_npm_arch
131 131
 
132 132
     $mesh_install_nodejs_prefix npm config set unsafe-perm true
133
+    if [ -f "$rootdir/usr/lib/node_modules/npm/node_modules/worker-farm/lib/farm.js" ]; then
134
+        # fix for failing cpu detection during image build with qemu, see https://github.com/npm/npm/issues/19265
135
+        sed -i "s|require('os').cpus().length|1|g" "$rootdir/usr/lib/node_modules/npm/node_modules/worker-farm/lib/farm.js"
136
+    fi
133 137
     $mesh_install_nodejs_prefix npm install --arch=$NPM_ARCH -g npm@${NPM_VERSION} --save
134 138
     if [ -f "$rootdir/usr/local/bin/npm" ]; then
135 139
         cp "$rootdir/usr/local/bin/npm" /usr/bin/npm