iop: update version info

iop/config

@@ -194,11 +194,16 @@ CONFIG_KERNEL_DEVTMPFS_MOUNT=y
 # CONFIG_BUSYBOX_CONFIG_IP is not set
 CONFIG_LOCALMIRROR="https://download.iopsys.eu/iopsys/mirror/"
 
-# Generation of /etc/banner.
+# Override the version information embedded in the
+# /etc/openwrt_version, /etc/openwrt_release, /etc/banner files
 CONFIG_IMAGEOPT=y
 CONFIG_VERSIONOPT=y
-CONFIG_VERSION_MANUFACTURER="iopsysWrt"
-CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu/"
+CONFIG_VERSION_DIST="iopsysWrt"
+CONFIG_VERSION_REPO="https://download.iopsys.eu/iopsys/release"
+CONFIG_VERSION_HOME_URL="https://dev.iopsys.eu"
+CONFIG_VERSION_MANUFACTURER="IOPSYS"
+CONFIG_VERSION_MANUFACTURER_URL="https://iopsys.eu"
+
 
 # Disable as much as possible of OpenWrt messy "pre-init" stuff.
 CONFIG_PREINITOPT=y

iop/scripts/genconfig.sh

@@ -419,8 +419,11 @@ function genconfig {
 
 		# Set target version
 		local GIT_TAG=$(git describe --abbrev=0 --tags)
+		local GIT_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+		local GIT_COMMIT=$(git rev-parse --short HEAD)
 		echo "CONFIG_TARGET_VERSION=\"${GIT_TAG}\"" >> .config
-		echo "CONFIG_VERSION_CODE=\"${GIT_TAG}\"" >> .config
+		echo "CONFIG_VERSION_NUMBER=\"${GIT_TAG}\"" >> .config
+		echo "CONFIG_VERSION_CODE=\"${GIT_BRANCH}-${GIT_COMMIT}\"" >> .config
 		echo "CONFIG_VERSION_PRODUCT=\"$BOARDTYPE"\" >> .config
 
 		# Enable Pckage source tree override if selected