Digi
/
meta-digi
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <gabriel.valcazar@digi.com>
This commit is contained in:
Gabriel Valcazar 2025-05-16 12:25:37 +02:00
parent e60dbe03cb
commit e03ef8941c
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meta-digi-arm/conf/machine/include/ccmp1.inc
View File

@ -85,8 +85,8 @@ BOOTDEVICE_LABELS ?= "nand-4-256-1024 usb"
# Remove NAND-based ubi/ubifs images added by st-machine-common-stm32mp.inc # Remove NAND-based ubi/ubifs images added by st-machine-common-stm32mp.inc
# because image_types_digi.bbclass already builds their own. # because image_types_digi.bbclass already builds their own.
MULTIUBI_BUILD:remove = "nand-4-256-1024" MULTIUBI_BUILD:remove = "nand_4_256_1024"
IMAGE_FSTYPES:remove = "stmultiubi" IMAGE_FSTYPES:remove = "multiubi"
# Wic files # Wic files
WKS_FILE_DEPENDS ?= " \ WKS_FILE_DEPENDS ?= " \