organize prebuilt binaries

rdmtc · Jul 27, 2018 · c6dff95 · c6dff95
1 parent 46598c4
commit c6dff95
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 4 deletions.
diff --git a/addon_files/update_addon b/addon_files/update_addon
diff --git a/build.sh b/build.sh
@@ -9,6 +9,7 @@ NODE_NAME=node-v${NODE_VERSION}-linux-${ARCH}
 NODE_URL=https://nodejs.org/dist/v${NODE_VERSION}/${NODE_NAME}.tar.xz
 
 ADDON_FILES=$BUILD_DIR/addon_files
+PREBUILT=$BUILD_DIR/prebuilt/$ARCH
 ADDON_TMP=$BUILD_DIR/addon_tmp
 
 mkdir $ADDON_TMP 2> /dev/null || rm -r $ADDON_TMP/*
@@ -26,12 +27,15 @@ echo "copying files to tmp dir..."
 cp -r $ADDON_FILES/* $ADDON_TMP/
 cp $BUILD_DIR/assets/logo-x-120.png $ADDON_TMP/redmatic/www/
 
-
 echo "installing node modules..."
 cd $ADDON_TMP/redmatic/lib
 npm install --silent --no-package-lock --production --no-optional --global-style
 rm $ADDON_TMP/redmatic/lib/package.json
 
+echo "copying prebuilt binaries to tmp dir..."
+cp -r $PREBUILT/* $ADDON_TMP/redmatic/
+cd $ADDON_TMP
+ln -s redmatic/bin/update_addon ./
 
 echo "installing additional Node-RED nodes..."
 cd $ADDON_TMP/redmatic/var
@@ -45,8 +49,8 @@ echo "adapt Node-RED..."
 rm -r $ADDON_TMP/redmatic/lib/node_modules/node-red/nodes/core/hardware
 #mv $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/nodes/registry/installer.js $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/nodes/registry/installer.js.orig
 #sed "s/var npmCommand =.*/var npmCommand = '\/usr\/local\/addons\/node-red\/bin\/npm';/" $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/nodes/registry/installer.js.orig > $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/nodes/registry/installer.js
-mv $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/log.js $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/log.js.orig
-sed "s/util\.log/console.log/g" $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/log.js.orig > $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/log.js
+#mv $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/log.js $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/log.js.orig
+#sed "s/util\.log/console.log/g" $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/log.js.orig > $ADDON_TMP/redmatic/lib/node_modules/node-red/red/runtime/log.js
 
 
 cd $BUILD_DIR

diff --git a/addon_files/redmatic/bin/git → prebuilt/armv6l/bin/git b/addon_files/redmatic/bin/git → prebuilt/armv6l/bin/git
diff --git a/addon_files/redmatic/bin/jq → prebuilt/armv6l/bin/jq b/addon_files/redmatic/bin/jq → prebuilt/armv6l/bin/jq
diff --git a/addon_files/redmatic/bin/update_addon → prebuilt/armv6l/bin/update_addon b/addon_files/redmatic/bin/update_addon → prebuilt/armv6l/bin/update_addon
diff --git a/addon_files/redmatic/lib/libcurl.la → prebuilt/armv6l/lib/libcurl.la b/addon_files/redmatic/lib/libcurl.la → prebuilt/armv6l/lib/libcurl.la
diff --git a/addon_files/redmatic/lib/libcurl.so → prebuilt/armv6l/lib/libcurl.so b/addon_files/redmatic/lib/libcurl.so → prebuilt/armv6l/lib/libcurl.so
diff --git a/addon_files/redmatic/lib/libcurl.so.4 → prebuilt/armv6l/lib/libcurl.so.4 b/addon_files/redmatic/lib/libcurl.so.4 → prebuilt/armv6l/lib/libcurl.so.4
diff --git a/addon_files/redmatic/lib/libcurl.so.4.5.0 → prebuilt/armv6l/lib/libcurl.so.4.5.0 b/addon_files/redmatic/lib/libcurl.so.4.5.0 → prebuilt/armv6l/lib/libcurl.so.4.5.0
diff --git a/addon_files/redmatic/lib/libjq.la → prebuilt/armv6l/lib/libjq.la b/addon_files/redmatic/lib/libjq.la → prebuilt/armv6l/lib/libjq.la
diff --git a/addon_files/redmatic/lib/libjq.so → prebuilt/armv6l/lib/libjq.so b/addon_files/redmatic/lib/libjq.so → prebuilt/armv6l/lib/libjq.so
diff --git a/addon_files/redmatic/lib/libjq.so.1 → prebuilt/armv6l/lib/libjq.so.1 b/addon_files/redmatic/lib/libjq.so.1 → prebuilt/armv6l/lib/libjq.so.1
diff --git a/addon_files/redmatic/lib/libjq.so.1.0.4 → prebuilt/armv6l/lib/libjq.so.1.0.4 b/addon_files/redmatic/lib/libjq.so.1.0.4 → prebuilt/armv6l/lib/libjq.so.1.0.4
diff --git a/addon_files/redmatic/libexec/git-core.tar.gz → prebuilt/armv6l/libexec/git-core.tar.gz b/addon_files/redmatic/libexec/git-core.tar.gz → prebuilt/armv6l/libexec/git-core.tar.gz