diff mbox series

[isar-cip-core,v5,1/8] register image classes via layer.conf

Message ID 20230216033544.1990604-2-felix.moessbauer@siemens.com (mailing list archive)
State Accepted
Headers show
Series Rework image classes | expand

Commit Message

Felix Moessbauer Feb. 16, 2023, 3:35 a.m. UTC 
This patch registers the provided image classes via the bblayer.conf
file. By that, no manual additions of these classes via kas is required
and erronous implementations are detected early (e.g. mandatory inputs
without defaults).

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
 conf/layer.conf                      | 2 ++
 doc/README.secureboot.md             | 1 -
 kas/opt/ebg-secure-boot-snakeoil.yml | 1 -
 kas/opt/swupdate.yml                 | 1 -
 4 files changed, 2 insertions(+), 3 deletions(-)
diff mbox series

Patch

diff --git a/conf/layer.conf b/conf/layer.conf
index 0c5fd39..2c888b2 100644
--- a/conf/layer.conf
+++ b/conf/layer.conf
@@ -22,3 +22,5 @@  LAYERSERIES_COMPAT_cip-core = "next"
 
 LAYERDIR_cip-core = "${LAYERDIR}"
 LAYERDIR_cip-core[vardepvalue] = "isar-cip-core"
+
+IMAGE_CLASSES += "squashfs verity swupdate"
diff --git a/doc/README.secureboot.md b/doc/README.secureboot.md
index 50562e1..b15ea93 100644
--- a/doc/README.secureboot.md
+++ b/doc/README.secureboot.md
@@ -151,7 +151,6 @@  header:
 
 local_conf_header:
   secure-boot-image: |
-    IMAGE_CLASSES += "verity"
     IMAGE_FSTYPES = "wic"
     WKS_FILE = "${MACHINE}-efibootguard-secureboot.wks.in"
     INITRAMFS_INSTALL:append = " initramfs-verity-hook"
diff --git a/kas/opt/ebg-secure-boot-snakeoil.yml b/kas/opt/ebg-secure-boot-snakeoil.yml
index a182a67..9a28453 100644
--- a/kas/opt/ebg-secure-boot-snakeoil.yml
+++ b/kas/opt/ebg-secure-boot-snakeoil.yml
@@ -16,7 +16,6 @@  header:
 
 local_conf_header:
   secure-boot-image: |
-    IMAGE_CLASSES += "verity"
     IMAGE_FSTYPES = "wic"
     IMAGE_TYPEDEP:wic += "verity"
     WKS_FILE = "${MACHINE}-efibootguard-secureboot.wks.in"
diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
index ae5e3a1..7902d82 100644
--- a/kas/opt/swupdate.yml
+++ b/kas/opt/swupdate.yml
@@ -19,7 +19,6 @@  local_conf_header:
     CIP_IMAGE_OPTIONS:append = " swupdate.inc"
 
   wic-swu: |
-    IMAGE_CLASSES += "squashfs"
     IMAGE_TYPEDEP:wic += "squashfs"
     IMAGE_FSTYPES = "wic"
     WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks.in"