From 63916b1143580fd3254b559b80a88b60220a514a Mon Sep 17 00:00:00 2001 From: Hector Palacios Date: Wed, 1 Jun 2022 17:06:03 +0200 Subject: [PATCH] swu-images: fix ccimx6ul ROOTFS extension when read-only enabled When read-only feature is enabled, the rootfs should be .squashfs and not .ubifs. Signed-off-by: Hector Palacios (cherry picked from commit c32278af74cea8cb38aa81590eaa867be1c739c9) Signed-off-by: Javier Viguera --- meta-digi-arm/conf/machine/include/ccimx6ul.inc | 2 +- meta-digi-arm/conf/machine/include/ccmp1.inc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccimx6ul.inc b/meta-digi-arm/conf/machine/include/ccimx6ul.inc index 37bd47106..9d5e91d82 100644 --- a/meta-digi-arm/conf/machine/include/ccimx6ul.inc +++ b/meta-digi-arm/conf/machine/include/ccimx6ul.inc @@ -53,7 +53,7 @@ TRUSTFENCE_SIGN_MODE = "HAB" # SWUpdate sw-description configuration BOOTFS_EXT ?= ".boot.ubifs" -ROOTFS_EXT ?= ".ubifs" +ROOTFS_EXT ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", ".squashfs", ".ubifs", d)}' BOOT_DEV_NAME ?= "linux" ROOTFS_DEV_NAME ?= "rootfs" diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc index 3b2a60e83..d093790e3 100644 --- a/meta-digi-arm/conf/machine/include/ccmp1.inc +++ b/meta-digi-arm/conf/machine/include/ccmp1.inc @@ -19,7 +19,7 @@ DEY_BUILD_PLATFORM = "STM" # SWUpdate sw-description configuration BOOTFS_EXT ?= ".boot.ubifs" -ROOTFS_EXT ?= ".ubifs" +ROOTFS_EXT ?= '${@bb.utils.contains("IMAGE_FEATURES", "read-only-rootfs", ".squashfs", ".ubifs", d)}' BOOT_DEV_NAME ?= "linux" ROOTFS_DEV_NAME ?= "rootfs"