diff mbox series

[isar-cip-core,1/1] fix operator precedence in ebg and swupdate

Message ID 20230419024859.19550-1-felix.moessbauer@siemens.com (mailing list archive)
State Accepted
Headers show
Series [isar-cip-core,1/1] fix operator precedence in ebg and swupdate | expand

Commit Message

MOESSBAUER, Felix April 19, 2023, 2:48 a.m. UTC
Instead of using the += operator, we need to use the :append operator to
append IMAGE_FSTYPES to a target. Otherwise, the additional types are
evaluated first and by that, weak assignments ( ?= ) are ignored.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 kas/opt/swupdate.yml                 | 2 +-
 recipes-core/images/efibootguard.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
index 2899d6c..29b7dd6 100644
--- a/kas/opt/swupdate.yml
+++ b/kas/opt/swupdate.yml
@@ -20,7 +20,7 @@  local_conf_header:
 
   wic-swu: |
     IMAGE_TYPEDEP:wic += "squashfs"
-    IMAGE_FSTYPES += "swu"
+    IMAGE_FSTYPES:append = " swu"
     # squashfs is already compressed
     SWU_COMPRESSION_TYPE = ""
     WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks.in"
diff --git a/recipes-core/images/efibootguard.inc b/recipes-core/images/efibootguard.inc
index bb1aa1d..23fb215 100644
--- a/recipes-core/images/efibootguard.inc
+++ b/recipes-core/images/efibootguard.inc
@@ -18,4 +18,4 @@  IMAGE_INSTALL:append:buster = " efibootguard"
 WIC_IMAGER_INSTALL:append = " efibootguard:${DISTRO_ARCH}"
 WDOG_TIMEOUT ?= "60"
 WICVARS += "WDOG_TIMEOUT KERNEL_IMAGE INITRD_IMAGE DTB_FILES"
-IMAGE_FSTYPES += "wic"
+IMAGE_FSTYPES:append = " wic"