Add HSM version file / Redis key

armbian/base/config/redis/factorysettings.txt

@@ -16,6 +16,8 @@ SET base:setup 0
 ZADD base:descriptionCode 0 0
 SET base:stateCode 0
 
+SET hsm:firmware:version xxx
+
 SET middleware:passwordSetup 0
 SET middleware:datadir /data/bbbmiddleware
 SET middleware:hsmserialport /dev/ttyS2

armbian/base/config/version_hsm

@@ -0,0 +1 @@
+4.4.0

armbian/base/customize-armbian-rockpro64.sh

@@ -34,13 +34,15 @@ set -e
 # CONFIG
 # ------------------------------------------------------------------------------
 
+# BitBoxBase and HSM version are set here:
+#   armbian/base/config/version_bbb
+#   armbian/base/config/version_hsm
+
 BITCOIN_VERSION="0.18.1"
 LIGHTNING_VERSION="0.7.3"
 ELECTRS_VERSION="0.7.0"
 BIN_DEPS_TAG='0.0.5'
 
-HSM_VERSION='4.3.0'
-
 PROMETHEUS_VERSION="2.11.1"
 PROMETHEUS_CHKSUM="33b4763032e7934870721ca3155a8ae0be6ed590af5e91bf4d2d4133a79e4548"
 NODE_EXPORTER_VERSION="0.18.1"
@@ -60,6 +62,7 @@ PRODUCTION IMAGE:       ${BASE_PRODUCTION_IMAGE}
 ================================================================================
 VERSIONS:
     BASE IMAGE          ${BASE_VERSION}
+    HSM                 ${HSM_VERSION}
     BINARY DEPS         ${BIN_DEPS_TAG}
     BITCOIN             ${BITCOIN_VERSION}
     LIGHTNING           ${LIGHTNING_VERSION}
@@ -151,7 +154,9 @@ source /etc/os-release
 BASE_DISTRIBUTION=${VERSION_CODENAME}
 BASE_DISTRIBUTION=${BASE_DISTRIBUTION:-"bionic"}
 
-BASE_VERSION=$(head -n1 /opt/shift/config/version)
+BASE_VERSION=$(head -n1 /opt/shift/config/version_bbb)
+HSM_VERSION=$(head -n1 /opt/shift/config/version_hsm)
+
 BASE_BUILDMODE=${1:-"armbian-build"}
 
 # Source configuration to read BASE_PRODUCTION_IMAGE
@@ -370,6 +375,7 @@ fi
 
 < /opt/shift/config/redis/factorysettings.txt sh /opt/shift/scripts/redis-pipe.sh | redis-cli --pipe
 redis-cli SET base:version "${BASE_VERSION}"
+redis-cli SET hsm:firmware:version "${HSM_VERSION}"
 redis-cli SET build:date "$(date +%Y-%m-%d)"
 redis-cli SET build:time "$(date +%H:%M)"
 redis-cli SET build:commit "$(cat /opt/shift/config/latest_commit)"

armbian/base/scripts/systemd-startup-after-redis.sh

@@ -31,8 +31,11 @@ source /opt/shift/scripts/include/updateTorOnions.sh.inc
 redis_require
 
 # update hardcoded Base image version
-VERSION=$(head -n1 /opt/shift/config/version)
-redis_set "base:version" "${VERSION}"
+VERSION_BBB=$(head -n1 /opt/shift/config/version_bbb)
+redis_set "base:version" "${VERSION_BBB}"
+
+VERSION_HSM=$(head -n1 /opt/shift/config/version_hsm)
+redis_set "base:version" "${VERSION_HSM}"
 
 
 # check for reset triggers on flashdrive

armbian/mender-convert.sh

@@ -18,7 +18,7 @@ fi
 
 ACTION=${1:-"build"}
 SOURCE_NAME="BitBoxBase_Armbian_RockPro64"
-VERSION="$(head -n1 base/config/version)"
+VERSION="$(head -n1 base/config/version_bbb)"
 TEMP_NAME="BitBoxBase"
 TARGET_NAME="BitBoxBase-v${VERSION}-RockPro64"