Merge branch 'no_depend_on_node_version'

* no_depend_on_node_version: NodeJSのVersionがbuild時のpathに入っていたため依存しないように修正
mnakada · Dec 17, 2021 · 47ccbc1 · 47ccbc1
2 parents c7b42fd + ff6c1cd
commit 47ccbc1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/buildscripts/build_all b/buildscripts/build_all
@@ -18,7 +18,7 @@ mips-linux-uclibc-gnu-gcc -fPIC -shared -o $ROOTFS/lib/modules/libcallback.so fi
 cp /src/configs/atomhack.ver $ROOTFS/etc
 
 # build webpage
-PATH=$PATH:/root/.nvm/versions/node/v16.11.1/bin
+. /root/.nvm/nvm.sh
 cp -pr /src/web /openmiko/build/buildroot-2016.02/output
 cd /openmiko/build/buildroot-2016.02/output/web
 npm install -g npm

diff --git a/buildscripts/rebuild_rootfs b/buildscripts/rebuild_rootfs
@@ -20,7 +20,7 @@ mips-linux-uclibc-gnu-gcc -fPIC -shared -o $ROOTFS/lib/modules/libcallback.so fi
 cp /src/configs/atomhack.ver $ROOTFS/etc
 
 # build webpage
-PATH=$PATH:/root/.nvm/versions/node/v16.11.1/bin
+. /root/.nvm/nvm.sh
 cp -pr /src/web /openmiko/build/buildroot-2016.02/output
 cd /openmiko/build/buildroot-2016.02/output/web
 npm install -g npm