genimage: support IMAGE_NAME_SUFFIX

Since nanbield [1], IMAGE_NAME and IMAGE_LINK_NAME include the IMAGE_NAME_SUFFIX, which means that the rootfs files gain an additional .rootfs suffix. Add support for this in genimage. [1]: https://docs.yoctoproject.org/4.3.1/migration-guides/migration-4.3.html#output-file-naming-changes Signed-off-by: Rouven Czerwinski <[email protected]>
pengutronix · Dec 12, 2023 · 2914c7f · 2914c7f
1 parent 23f7990
commit 2914c7f
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/classes-recipe/genimage.bbclass b/classes-recipe/genimage.bbclass
@@ -94,6 +94,7 @@ GENIMAGE_IMAGE_LINK_FULLNAME ?= "${GENIMAGE_IMAGE_LINK_NAME}.${GENIMAGE_IMAGE_SU
 
 GENIMAGE_ROOTFS_IMAGE ?= ""
 GENIMAGE_ROOTFS_IMAGE_FSTYPE ?= "tar.bz2"
+GENIMAGE_ROOTFS_IMAGE_SUFFIX ?= "rootfs"
 
 GENIMAGE_VARIABLES[IMAGE] = "${GENIMAGE_IMAGE_FULLNAME}"
 
@@ -138,8 +139,8 @@ python do_genimage_preprocess () {
 fakeroot do_genimage () {
     # unpack input rootfs image if given
     if [ "x${GENIMAGE_ROOTFS_IMAGE}" != "x" ]; then
-        bbnote "Unpacking ${DEPLOY_DIR_IMAGE}/${GENIMAGE_ROOTFS_IMAGE}-${MACHINE}.${GENIMAGE_ROOTFS_IMAGE_FSTYPE} to ${GENIMAGE_ROOTDIR}"
-        tar -xf ${DEPLOY_DIR_IMAGE}/${GENIMAGE_ROOTFS_IMAGE}-${MACHINE}.${GENIMAGE_ROOTFS_IMAGE_FSTYPE} -C ${GENIMAGE_ROOTDIR}
+        bbnote "Unpacking ${DEPLOY_DIR_IMAGE}/${GENIMAGE_ROOTFS_IMAGE}-${MACHINE}.${GENIMAGE_ROOTFS_IMAGE_SUFFIX}.${GENIMAGE_ROOTFS_IMAGE_FSTYPE} to ${GENIMAGE_ROOTDIR}"
+        tar -xf ${DEPLOY_DIR_IMAGE}/${GENIMAGE_ROOTFS_IMAGE}-${MACHINE}.${GENIMAGE_ROOTFS_IMAGE_SUFFIX}.${GENIMAGE_ROOTFS_IMAGE_FSTYPE} -C ${GENIMAGE_ROOTDIR}
     fi
 
     genimage \