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

Commit Message

Felix Moessbauer Dec. 11, 2024, 9:56 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 <[e-mail]>
---
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 --
 3 files changed, 2 insertions(+), 2 deletions(-)

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"