diff --git a/meta-digi-dey/recipes-digi/swu-images/files/sw-description b/meta-digi-dey/recipes-digi/swu-images/files/sw-description index ddd469d42..8d0af5f13 100644 --- a/meta-digi-dey/recipes-digi/swu-images/files/sw-description +++ b/meta-digi-dey/recipes-digi/swu-images/files/sw-description @@ -26,6 +26,10 @@ software = { name = "upgrade_available"; value = "1"; + }, + { + name = "rootfstype" + value = "##ROOTFS_TYPE##" } ); } @@ -51,6 +55,10 @@ software = { name = "upgrade_available"; value = "1"; + }, + { + name = "rootfstype" + value = "##ROOTFS_TYPE##" } ); } @@ -99,6 +107,10 @@ software = { name = "upgrade_available"; value = "1"; + }, + { + name = "rootfstype" + value = "##ROOTFS_TYPE##" } ); } @@ -123,6 +135,10 @@ software = { name = "upgrade_available"; value = "1"; + }, + { + name = "rootfstype" + value = "##ROOTFS_TYPE##" } ); } diff --git a/meta-digi-dey/recipes-digi/swu-images/swu.inc b/meta-digi-dey/recipes-digi/swu-images/swu.inc index f3e35c8ef..444615d1e 100644 --- a/meta-digi-dey/recipes-digi/swu-images/swu.inc +++ b/meta-digi-dey/recipes-digi/swu-images/swu.inc @@ -58,6 +58,7 @@ BOOT_DEV_NAME_B ?= "${@bb.utils.contains('STORAGE_MEDIA', 'mmc', '/dev/mmcblk0p2 ROOTFS_DEV_NAME_A ?= "${@bb.utils.contains('STORAGE_MEDIA', 'mmc', '/dev/mmcblk0p3', 'rootfs_a', d)}" ROOTFS_DEV_NAME_B ?= "${@bb.utils.contains('STORAGE_MEDIA', 'mmc', '/dev/mmcblk0p4', 'rootfs_b', d)}" +ROOTFS_TYPE = "${@bb.utils.contains('IMAGE_FEATURES', 'read-only-rootfs', 'squashfs', '', d)}" do_unpack[postfuncs] += "fill_description" fill_description() { @@ -84,4 +85,9 @@ fill_description() { sed -i -e "s,##BOOT_DEV_B##,${BOOT_DEV_NAME_B},g" "${WORKDIR}/sw-description" sed -i -e "s,##ROOTFS_DEV_A##,${ROOTFS_DEV_NAME_A},g" "${WORKDIR}/sw-description" sed -i -e "s,##ROOTFS_DEV_B##,${ROOTFS_DEV_NAME_B},g" "${WORKDIR}/sw-description" + if [ -n "${@bb.utils.contains('IMAGE_FEATURES', 'read-only-rootfs', '1', '', d)}" ]; then + sed -i '/compressed/d' "${WORKDIR}/sw-description" + fi + sed -i -e "s,##ROOTFS_TYPE##,${ROOTFS_TYPE},g" "${WORKDIR}/sw-description" + }