diff mbox series

[isar-cip-core,11/19] cip-core-image: Do not include swupdate.inc unless it is used

Message ID a7c18fa36c9afc6f4c52d174d3545dfefe51b749.1649834193.git.jan.kiszka@siemens.com (mailing list archive)
State New
Headers show
Series SWUpdate & EFI Boot Guard refactorings | expand

Commit Message

Jan Kiszka April 13, 2022, 7:16 a.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

Was harmless to do so for non-swupdate images, but also unneeded.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kas/opt/ebg-secure-boot-snakeoil.yml  | 5 +++--
 kas/opt/swupdate.yml                  | 3 +++
 recipes-core/images/cip-core-image.bb | 5 ++---
 3 files changed, 8 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/kas/opt/ebg-secure-boot-snakeoil.yml b/kas/opt/ebg-secure-boot-snakeoil.yml
index 28b3545..be58b15 100644
--- a/kas/opt/ebg-secure-boot-snakeoil.yml
+++ b/kas/opt/ebg-secure-boot-snakeoil.yml
@@ -15,8 +15,9 @@  header:
    - kas/opt/efibootguard.yml
 
 local_conf_header:
-  image-options: |
-    CIP_IMAGE_OPTIONS_append = " read-only.inc"
+  image-options-swupdate-ro: |
+    CIP_IMAGE_OPTIONS_append = " swupdate.inc read-only.inc"
+
   swupdate: |
     IMAGE_INSTALL_append = " swupdate"
     IMAGE_INSTALL_append = " swupdate-handler-roundrobin"
diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
index a8b903f..1b2aff4 100644
--- a/kas/opt/swupdate.yml
+++ b/kas/opt/swupdate.yml
@@ -19,6 +19,9 @@  local_conf_header:
     IMAGE_INSTALL_append = " swupdate"
     IMAGE_INSTALL_append = " swupdate-handler-roundrobin"
 
+  image-option-swupdate: |
+    CIP_IMAGE_OPTIONS_append = " swupdate.inc"
+
   wic-swu: |
     IMAGE_FSTYPES = "wic-swu-img"
     WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
diff --git a/recipes-core/images/cip-core-image.bb b/recipes-core/images/cip-core-image.bb
index 9bf21ff..ecba06d 100644
--- a/recipes-core/images/cip-core-image.bb
+++ b/recipes-core/images/cip-core-image.bb
@@ -11,12 +11,11 @@ 
 
 inherit image
 inherit image_uuid
+
 ISAR_RELEASE_CMD = "git -C ${LAYERDIR_cip-core} describe --tags --dirty --always --match 'v[0-9].[0-9]*'"
 DESCRIPTION = "CIP Core image"
 
 IMAGE_INSTALL += "customizations"
 
-# for swupdate
-SWU_DESCRIPTION ??= "swupdate"
-CIP_IMAGE_OPTIONS ?= "${SWU_DESCRIPTION}.inc"
+CIP_IMAGE_OPTIONS ?= ""
 include ${CIP_IMAGE_OPTIONS}