Merge branch 'release/13.1.0'

CANDY-LINE · Feb 5, 2021 · 5483341 · 5483341
2 parents 102d20b + be28e4b
commit 5483341
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,4 +1,9 @@
 # Revision History
+* 13.1.0
+  - Node.js v12.20.1
+  - CANDY RED 9.9.3
+  - Add a file containing the published OS image version
+
 * 13.0.0
   - CANDY Pi Lite Board Service 10.2.1
   - CANDY RED 9.9.2

diff --git a/README.md b/README.md
@@ -54,8 +54,6 @@ 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=12.0.0
-
 # using IIJ Mobile
 FIRST_USER_NAME="pi" \
   FIRST_USER_PASS="raspberry" \
@@ -74,6 +72,8 @@ FIRST_USER_NAME="pi" \
 time ./scripts/build_img.sh
 
 # Upload image files
+RELEASE_VERSION=13.1.0
+
 GITHUB_OAUTH_TOKEN=YOUR_GITHUB_OAUTH_TOKEN \
   TAG_NAME=${RELEASE_VERSION} \
   ./scripts/deploy_zip.sh

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
@@ -14,8 +14,6 @@ locale-gen
 NODEJS_BASE_URL=https://unofficial-builds.nodejs.org/download/release/v
 NODEJS_ARCH=armv6l
 
-NODEJS_VERSION="12.18.3"
-
 apt-get remove -y nodered nodejs nodejs-legacy npm
 rm -f \
   /usr/bin/node \

diff --git a/overlay/stage2-1-en_US/99-candy-pi-lite/00-run.sh b/overlay/stage2-1-en_US/99-candy-pi-lite/00-run.sh
@@ -0,0 +1,9 @@
+#!/bin/bash -e
+
+# Set CANDY Pi Lite OS Image Release Version Name file
+echo -e "Name:${IMG_NAME}\n\rVersion:${IMG_VERSION}" > ${ROOTFS_DIR}/boot/candy-pi-lite-os-image_${IMG_VERSION}
+
+# Set release version and OS image name
+mkdir -p ${ROOTFS_DIR}/opt/candy-line/os-image
+echo "${IMG_NAME}" > ${ROOTFS_DIR}/opt/candy-line/os-image/name
+echo "${IMG_VERSION}" > ${ROOTFS_DIR}/opt/candy-line/os-image/version
diff --git a/scripts/before_script.sh b/scripts/before_script.sh
@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 
+IMG_VERSION="v13.1.0"
 DEPS_DIR=$(pwd)/deps
 PIGEN_DIR=${DEPS_DIR}/pi-gen
 MOVIDIUS=${MOVIDIUS:-0}
 CANDY_PI_LITE_VERSION=${CANDY_PI_LITE_VERSION:-"10.2.1"}
-CANDY_RED_HASH=${CANDY_RED_HASH:-"9.9.2"}
+CANDY_RED_HASH=${CANDY_RED_HASH:-"9.9.3"}
 RPI_FIRMWARE_VERSION=${RPI_FIRMWARE_VERSION:-"1.20210108"}
+NODEJS_VERSION="12.20.1"
 BOOT_APN=${BOOT_APN:-""}
 BUTTON_EXT=${BUTTON_EXT:-""}
 BASE_ROOT_MARGIN=${BASE_ROOT_MARGIN:-"400"}
@@ -21,23 +23,25 @@ function clean_setup {
 }
 
 function add_config {
-  echo "[add_config] ${1} => [${!1}]"
   if [ -n "${!1}" ]; then
-    echo "$1=${!1}" >> ${PIGEN_DIR}/config
+    echo "[add_config] ${1} => [${!1}]"
+    echo "export $1=${!1}" >> ${PIGEN_DIR}/config
   fi
 }
 
 function create_config {
-  IMG_NAME=${2:-candy-pi-lite-raspbian}
+  IMG_NAME="${IMG_NAME:-candy-pi-lite-raspbian}"
   echo "IMG_NAME=${IMG_NAME}" > ${PIGEN_DIR}/config
   pushd ${PIGEN_DIR}
   GIT_HASH=$(git rev-parse HEAD)
   popd
-  echo "GIT_HASH=${GIT_HASH}" >> ${PIGEN_DIR}/config
+  add_config GIT_HASH
   add_config FIRST_USER_NAME
   add_config FIRST_USER_PASS
   add_config ENABLE_SSH
   add_config TARGET_HOSTNAME
+  add_config IMG_VERSION
+  add_config NODEJS_VERSION
 }
 
 function configure_stages {