Use semver to record image versions

meta-citadel/classes/citadel-image.bbclass

@@ -15,13 +15,13 @@ do_citadel_mkimage() {
     cat > ${B}/mkimage.conf << EOF
 image-type = "${CITADEL_IMAGE_TYPE}"
 channel = "${CITADEL_IMAGE_CHANNEL}"
-version = ${CITADEL_IMAGE_VERSION}
+version = "${CITADEL_IMAGE_VERSION}"
 timestamp = "${DATETIME}"
 source = "${IMGDEPLOYDIR}/${IMAGE_LINK_NAME}.ext4"
 compress = ${CITADEL_IMAGE_COMPRESS}
 EOF
 
-    ver=$(printf "%03d" ${CITADEL_IMAGE_VERSION})
+    ver="${CITADEL_IMAGE_VERSION}"
 
     if [ "${CITADEL_IMAGE_TYPE}" = "kernel" ]; then
         KERNEL_ID=$(generate_kernel_id)

meta-citadel/recipes-citadel/images/base-realmfs-image.bb

@@ -9,12 +9,12 @@ inherit deploy
 require citadel-image.inc
 
 REALMFS_DIR = "${TOPDIR}/realmfs"
-CITADEL_IMAGE_VERSION = "1"
+CITADEL_IMAGE_VERSION = "${CITADEL_IMAGE_VERSION_realmfs}"
 do_realmfs_mkimage() {
     cat > ${B}/mkimage.conf << EOF
 image-type = "realmfs"
 channel = "${CITADEL_IMAGE_CHANNEL}"
-version = 1
+version = "${CITADEL_IMAGE_VERSION}"
 timestamp = "${DATETIME}"
 source = "${REALMFS_DIR}/citadel-realmfs.ext4"
 realmfs-name = "base"
@@ -28,7 +28,7 @@ do_realmfs_mkimage[vardepsexclude] = "DATETIME"
 do_realmfs_mkimage[cleandirs] = "${B}"
 
 do_deploy() {
-    ver=$(printf "%03d" ${CITADEL_IMAGE_VERSION})
+    ver=${CITADEL_IMAGE_VERSION}
     fname="citadel-realmfs-${CITADEL_IMAGE_CHANNEL}-${ver}.img"
     install -m 644 -T ${B}/${fname} ${DEPLOYDIR}/base-realmfs.img
 }

meta-citadel/recipes-citadel/images/citadel-image.inc

@@ -1,9 +1,10 @@
 
 CITADEL_IMAGE_CHANNEL = "dev"
 
-CITADEL_IMAGE_VERSION_rootfs = "1"
-CITADEL_IMAGE_VERSION_extra = "1"
-CITADEL_IMAGE_VERSION_kernel = "1"
+CITADEL_IMAGE_VERSION_rootfs = "0.0.1"
+CITADEL_IMAGE_VERSION_extra = "0.0.1"
+CITADEL_IMAGE_VERSION_kernel = "0.0.1"
+CITADEL_IMAGE_VERSION_realmfs = "0.0.1"
 
 CITADEL_KERNEL_VERSION = "6.14.0"
 

meta-citadel/recipes-citadel/images/citadel-installer-image.bb

@@ -95,7 +95,7 @@ EOF
 }
 
 install_resource_image() {
-    version=$(printf "%03d" ${2})
+    version=${2}
 
     if [ "${1}" = "kernel" ]; then
         src_fname="citadel-kernel-${CITADEL_KERNEL_VERSION}-${CITADEL_IMAGE_CHANNEL}-${version}.img"