| Message ID | 20241210154546.2670554-1-felix.moessbauer@siemens.com (mailing list archive) |
|---|---|
| State | New |
| Headers | show |
| Series | [isar-cip-core,1/1] define RO_ROOTFS_TYPE before using | expand |
On 10.12.24 16:45, Felix Moessbauer wrote: > 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. > > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> > --- > classes/swupdate.bbclass | 1 + > classes/verity.bbclass | 1 + > 2 files changed, 2 insertions(+) > > 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" Please drop the default from conf/distro/cip-core-common.inc then. Jan
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"
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. Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> --- classes/swupdate.bbclass | 1 + classes/verity.bbclass | 1 + 2 files changed, 2 insertions(+)