diff mbox series

[isar-cip-core] secureboot: Move IMAGE_TYPEDEP_wic out of verity class

Message ID 2a3d6b67-7771-b068-f030-3bb0becfe10b@siemens.com (mailing list archive)
State Handled Elsewhere
Headers show
Series [isar-cip-core] secureboot: Move IMAGE_TYPEDEP_wic out of verity class | expand

Commit Message

Jan Kiszka Oct. 18, 2022, 12:50 p.m. UTC 
From: Jan Kiszka <jan.kiszka@siemens.com>

The usage of class is not bound to wic, thus we should not declare any
dependency of wic on it. This makes the verity pattern analogous to the
squashfs one (for non-secure booting).

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 classes/verity.bbclass               | 1 -
 kas/opt/ebg-secure-boot-snakeoil.yml | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
diff mbox series

Patch

diff --git a/classes/verity.bbclass b/classes/verity.bbclass
index 0f154fb6..b6b06f41 100644
--- a/classes/verity.bbclass
+++ b/classes/verity.bbclass
@@ -14,7 +14,6 @@  VERITY_IMAGE_TYPE ?= "squashfs"
 inherit ${VERITY_IMAGE_TYPE}
 
 IMAGE_TYPEDEP_verity = "${VERITY_IMAGE_TYPE}"
-IMAGE_TYPEDEP_wic += "verity"
 IMAGER_INSTALL_verity += "cryptsetup"
 
 VERITY_INPUT_IMAGE ?= "${IMAGE_FULLNAME}.${VERITY_IMAGE_TYPE}"
diff --git a/kas/opt/ebg-secure-boot-snakeoil.yml b/kas/opt/ebg-secure-boot-snakeoil.yml
index f756ceea..e92ea5e0 100644
--- a/kas/opt/ebg-secure-boot-snakeoil.yml
+++ b/kas/opt/ebg-secure-boot-snakeoil.yml
@@ -18,6 +18,7 @@  local_conf_header:
   secure-boot-image: |
     IMAGE_CLASSES += "verity"
     IMAGE_FSTYPES = "wic"
+    IMAGE_TYPEDEP_wic += "verity"
     WKS_FILE = "${MACHINE}-efibootguard-secureboot.wks.in"
     INITRAMFS_INSTALL_append = " initramfs-verity-hook"
     # abrootfs cannot be installed together with verity