diff mbox series

[isar-cip-core,v3,1/1] define RO_ROOTFS_TYPE before using

Message ID 20241211113213.2743931-1-felix.moessbauer@siemens.com (mailing list archive)
State New
Headers show
Series [isar-cip-core,v3,1/1] define RO_ROOTFS_TYPE before using | expand

Commit Message

Felix Moessbauer Dec. 11, 2024, 11:32 a.m. UTC 
When including isar-cip-core in another layer and not using the cip-core
distribution, the RO_ROOTFS_TYPE is undefined. This results in parsing
errors.

We now provide a weak default in the verity and squashfs recipes to not
break the parsing in downstream layers. As we no longer need the
definition in the distro file, we remove it there.

Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
Changes since v2:
- add missing definition in swupdate.yml (used to control which
  initrd is build).

Changes since v1:
- remove RO_ROOTFS_TYPE from distro file

 classes/swupdate.bbclass        | 1 +
 classes/verity.bbclass          | 1 +
 conf/distro/cip-core-common.inc | 2 --
 kas/opt/swupdate.yml            | 1 +
 4 files changed, 3 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/classes/swupdate.bbclass b/classes/swupdate.bbclass
index 5bf021a..3243f67 100644
--- a/classes/swupdate.bbclass
+++ b/classes/swupdate.bbclass
@@ -12,6 +12,7 @@ 
 
 inherit template
 
+RO_ROOTFS_TYPE ??= "squashfs"
 SWU_ROOTFS_TYPE ?= "${RO_ROOTFS_TYPE}"
 SWU_ROOTFS_NAME ?= "${IMAGE_FULLNAME}"
 # compression type as defined by swupdate (zlib or zstd). Set to empty string to disable compression
diff --git a/classes/verity.bbclass b/classes/verity.bbclass
index 231d172..c3b89ec 100644
--- a/classes/verity.bbclass
+++ b/classes/verity.bbclass
@@ -12,6 +12,7 @@ 
 IMAGE_TYPEDEP:verity = "${VERITY_IMAGE_TYPE}"
 IMAGER_INSTALL:verity += "cryptsetup"
 
+RO_ROOTFS_TYPE ??= "squashfs"
 VERITY_IMAGE_TYPE ?= "${RO_ROOTFS_TYPE}"
 VERITY_INPUT_IMAGE ?= "${IMAGE_FULLNAME}.${VERITY_IMAGE_TYPE}"
 VERITY_OUTPUT_IMAGE ?= "${IMAGE_FULLNAME}.verity"
diff --git a/conf/distro/cip-core-common.inc b/conf/distro/cip-core-common.inc
index 3323dd0..d06eef0 100644
--- a/conf/distro/cip-core-common.inc
+++ b/conf/distro/cip-core-common.inc
@@ -15,8 +15,6 @@  WKS_FILE ?= "${MACHINE}.wks"
 
 CIP_IMAGE_OPTIONS ?= ""
 
-RO_ROOTFS_TYPE ?= "squashfs"
-
 IMAGER_BUILD_DEPS:append = " dosfstools-native"
 IMAGER_BUILD_DEPS:remove:buster = "dosfstools-native"
 
diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
index 837efa7..38dc390 100644
--- a/kas/opt/swupdate.yml
+++ b/kas/opt/swupdate.yml
@@ -20,6 +20,7 @@  local_conf_header:
     OVERRIDES .= ":swupdate"
 
   wic-swu: |
+    RO_ROOTFS_TYPE ??= "squashfs"
     IMAGE_TYPEDEP:wic += "${RO_ROOTFS_TYPE}"
     IMAGE_FSTYPES:append = " swu"
     # input is already compressed