Merge branch 'release/11.0.0'

CANDY-LINE · Aug 28, 2020 · 36243d4 · 36243d4
2 parents 57d4616 + 45e5085
commit 36243d4
Show file tree

Hide file tree

Showing 5 changed files with 32 additions and 20 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Revision History
+* 11.0.0
+  - CANDY Pi Lite Board Service 10.0.1
+  - CANDY RED 9.7.0
+  - Raspberry Pi OS Firmware v[1.20200819](https://github.com/raspberrypi/firmware/tree/1.20200819)
+    - Linux Kernel 5.4
 
 * 10.0.0
   - CANDY Pi Lite Board Service 10.0.1

diff --git a/README.md b/README.md
@@ -54,7 +54,7 @@ Use [balenaEtcher](https://www.balena.io/etcher/) for burning the image, which i
 ```
 # create a tag for the version then push it to remote
 
-RELEASE_VERSION=10.0.0
+RELEASE_VERSION=11.0.0
 
 # using IIJ Mobile
 FIRST_USER_NAME="pi" \

diff --git a/overlay/stage2-1-en_US/00-configuration/01-run-chroot.sh b/overlay/stage2-1-en_US/00-configuration/01-run-chroot.sh
@@ -7,12 +7,14 @@ locale-gen
 
 # ARMv6 Binaries Tweak: https://github.com/nodejs/build/issues/1677#issuecomment-486204349
 
-# Node.js v11 or before
-# ARMv6_NODEJS_BASE_URL=https://nodejs.org/dist/v
-# Node.js v12 or later
-ARMv6_NODEJS_BASE_URL=https://unofficial-builds.nodejs.org/download/release/v
+# Node.js for ARMv7+
+# NODEJS_BASE_URL=https://nodejs.org/dist/v
+# NODEJS_ARCH=armv7l
+# Node.js for ARMv6
+NODEJS_BASE_URL=https://unofficial-builds.nodejs.org/download/release/v
+NODEJS_ARCH=armv6l
 
-ARMv6_NODEJS_VERSION="12.18.3"
+NODEJS_VERSION="12.18.3"
 
 apt-get remove -y nodered nodejs nodejs-legacy npm
 rm -f \
@@ -24,13 +26,13 @@ rm -f \
   /usr/local/bin/npm
 
 cd /tmp
-wget ${ARMv6_NODEJS_BASE_URL}${ARMv6_NODEJS_VERSION}/node-v${ARMv6_NODEJS_VERSION}-linux-armv6l.tar.gz
-tar zxf node-v${ARMv6_NODEJS_VERSION}-linux-armv6l.tar.gz
-cd node-v${ARMv6_NODEJS_VERSION}-linux-armv6l/
+wget ${NODEJS_BASE_URL}${NODEJS_VERSION}/node-v${NODEJS_VERSION}-linux-${NODEJS_ARCH}.tar.gz
+tar zxf node-v${NODEJS_VERSION}-linux-${NODEJS_ARCH}.tar.gz
+cd node-v${NODEJS_VERSION}-linux-${NODEJS_ARCH}/
 cp -R * /usr/
 rm -f /usr/CHANGELOG.md /usr/LICENSE /usr/README.md
-rm -f /tmp/node-v${ARMv6_NODEJS_VERSION}-linux-armv6l.tar.gz
-rm -fr /tmp/node-v${ARMv6_NODEJS_VERSION}-linux-armv6l/
+rm -f /tmp/node-v${NODEJS_VERSION}-linux-${NODEJS_ARCH}.tar.gz
+rm -fr /tmp/node-v${NODEJS_VERSION}-linux-${NODEJS_ARCH}/
 rm -f /usr/CHANGELOG.md
 rm -f /usr/LICENSE
 rm -f /usr/README.md
diff --git a/overlay/stage2-1-en_US/99-candy-pi-lite/00-run-chroot.sh b/overlay/stage2-1-en_US/99-candy-pi-lite/00-run-chroot.sh
@@ -21,15 +21,20 @@ if [ ! -f "/opt/candy-line/candy-pi-lite/uninstall.sh" ]; then
             echo "FAILED TO INSTALL candy-pi-lite-service@${CANDY_PI_LITE_VERSION}"
             exit 1
         fi
-        CANDY_RED_APT_GET_UPDATED=1 LOCAL_INSTALL=0 npm install -g --unsafe-perm --production https://github.com/CANDY-LINE/candy-red/archive/${CANDY_RED_HASH}.tar.gz
+        echo "Trying to install CANDY RED (v${CANDY_RED_HASH}) from NPM repo"
+        npm install -g --production --unsafe-perm candy-red@${CANDY_RED_HASH}
         if [ "$?" != "0" ]; then
-            echo "FAILED TO INSTALL candy-red@${CANDY_RED_HASH}"
-            exit 1
+            echo "NPM install failed. Now Trying to install CANDY RED (v${CANDY_RED_HASH}) from GitHub repo"
+            CANDY_RED_APT_GET_UPDATED=1 LOCAL_INSTALL=0 npm install -g --unsafe-perm --production https://github.com/CANDY-LINE/candy-red/archive/${CANDY_RED_HASH}.tar.gz
+            if [ "$?" != "0" ]; then
+                echo "FAILED TO INSTALL candy-red@${CANDY_RED_HASH}"
+                exit 1
+            fi
+            pushd /usr/lib/node_modules/candy-red
+            # Install all dependencies and run prepare stage script
+            LOCAL_INSTALL=0 DEVEL=true npm install --unsafe-perm
+            popd
         fi
-        pushd /usr/lib/node_modules/candy-red
-        # Install all dependencies and run prepare stage script
-        LOCAL_INSTALL=0 DEVEL=true npm install --unsafe-perm
-        popd
     fi
 
     # Always Enable UFW

diff --git a/scripts/before_script.sh b/scripts/before_script.sh
@@ -4,8 +4,8 @@ DEPS_DIR=$(pwd)/deps
 PIGEN_DIR=${DEPS_DIR}/pi-gen
 MOVIDIUS=${MOVIDIUS:-0}
 CANDY_PI_LITE_VERSION=${CANDY_PI_LITE_VERSION:-"10.0.1"}
-CANDY_RED_HASH=${CANDY_RED_HASH:-"9.6.0"}
-RPI_FIRMWARE_VERSION=${RPI_FIRMWARE_VERSION:-"1.20200723"}
+CANDY_RED_HASH=${CANDY_RED_HASH:-"9.7.0"}
+RPI_FIRMWARE_VERSION=${RPI_FIRMWARE_VERSION:-"1.20200819"}
 BOOT_APN=${BOOT_APN:-""}
 BUTTON_EXT=${BUTTON_EXT:-""}
 BASE_ROOT_MARGIN=${BASE_ROOT_MARGIN:-"400"}