diff mbox series

[isar-cip-core,12/19] cip-core-image: Make image-uuid an image option

Message ID 51a923c07081a08eff871979a91aae7926df5e3c.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>

This allows to avoid running this needless task for the secure image
where we use the dm-verity hash as image identification.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kas/opt/ebg-swu.yml                   |  3 +++
 recipes-core/images/cip-core-image.bb |  1 -
 recipes-core/images/image-uuid.inc    | 12 ++++++++++++
 3 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 recipes-core/images/image-uuid.inc
diff mbox series

Patch

diff --git a/kas/opt/ebg-swu.yml b/kas/opt/ebg-swu.yml
index a58f0ed..d811929 100644
--- a/kas/opt/ebg-swu.yml
+++ b/kas/opt/ebg-swu.yml
@@ -18,3 +18,6 @@  header:
 local_conf_header:
   initramfs: |
     IMAGE_INSTALL += "initramfs-abrootfs-hook"
+
+  image-option-uuid: |
+    CIP_IMAGE_OPTIONS_append = " image-uuid.inc"
diff --git a/recipes-core/images/cip-core-image.bb b/recipes-core/images/cip-core-image.bb
index ecba06d..3f8c320 100644
--- a/recipes-core/images/cip-core-image.bb
+++ b/recipes-core/images/cip-core-image.bb
@@ -10,7 +10,6 @@ 
 #
 
 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"
diff --git a/recipes-core/images/image-uuid.inc b/recipes-core/images/image-uuid.inc
new file mode 100644
index 0000000..5e5a727
--- /dev/null
+++ b/recipes-core/images/image-uuid.inc
@@ -0,0 +1,12 @@ 
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2022
+#
+# Authors:
+#  Jan Kiszka <jan.kiszka@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+
+inherit image_uuid