From e03ef8941c4fa5320ab5b149b65e11ffeabc10d4 Mon Sep 17 00:00:00 2001 From: Gabriel Valcazar Date: Fri, 16 May 2025 12:25:37 +0200 Subject: [PATCH] ccmp1: remove spurious UBI/UBIFS images In theory, we already had the necessary changes to remove these images, but two things needed tweaking: * MULTIUBI_BUILD values use underscores instead of hyphens, so use underscores to properly remove the default value inherited from BOOTDEVICE_LABELS. * STM used to incorporate a custom "stmultiubi" image type in the stm32mp builds, but they've replaced this with the upstream "multiubi" type. Reflect this change to avoid generating additional UBI/UBIFS images in our builds. Signed-off-by: Gabriel Valcazar --- meta-digi-arm/conf/machine/include/ccmp1.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/meta-digi-arm/conf/machine/include/ccmp1.inc b/meta-digi-arm/conf/machine/include/ccmp1.inc index 0a58be9f2..46450e26c 100644 --- a/meta-digi-arm/conf/machine/include/ccmp1.inc +++ b/meta-digi-arm/conf/machine/include/ccmp1.inc @@ -85,8 +85,8 @@ BOOTDEVICE_LABELS ?= "nand-4-256-1024 usb" # Remove NAND-based ubi/ubifs images added by st-machine-common-stm32mp.inc # because image_types_digi.bbclass already builds their own. -MULTIUBI_BUILD:remove = "nand-4-256-1024" -IMAGE_FSTYPES:remove = "stmultiubi" +MULTIUBI_BUILD:remove = "nand_4_256_1024" +IMAGE_FSTYPES:remove = "multiubi" # Wic files WKS_FILE_DEPENDS ?= " \