Skip to content

Commit 47ccbc1

Browse files
committed
Merge branch 'no_depend_on_node_version'
* no_depend_on_node_version: NodeJSのVersionがbuild時のpathに入っていたため依存しないように修正
2 parents c7b42fd + ff6c1cd commit 47ccbc1

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

buildscripts/build_all

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ mips-linux-uclibc-gnu-gcc -fPIC -shared -o $ROOTFS/lib/modules/libcallback.so fi
1818
cp /src/configs/atomhack.ver $ROOTFS/etc
1919

2020
# build webpage
21-
PATH=$PATH:/root/.nvm/versions/node/v16.11.1/bin
21+
. /root/.nvm/nvm.sh
2222
cp -pr /src/web /openmiko/build/buildroot-2016.02/output
2323
cd /openmiko/build/buildroot-2016.02/output/web
2424
npm install -g npm

buildscripts/rebuild_rootfs

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ mips-linux-uclibc-gnu-gcc -fPIC -shared -o $ROOTFS/lib/modules/libcallback.so fi
2020
cp /src/configs/atomhack.ver $ROOTFS/etc
2121

2222
# build webpage
23-
PATH=$PATH:/root/.nvm/versions/node/v16.11.1/bin
23+
. /root/.nvm/nvm.sh
2424
cp -pr /src/web /openmiko/build/buildroot-2016.02/output
2525
cd /openmiko/build/buildroot-2016.02/output/web
2626
npm install -g npm

0 commit comments

Comments
 (0)