| Message ID | 20230118090400.1582100-1-felix.moessbauer@siemens.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [isar-cip-core,v3,1/1] Use global variables for abrootfs partition uuids | expand |
On 1/18/23 10:04, Felix Moessbauer wrote: > This patch converts the abrootfs partition uuids to a template and adds > two global variables to control their values. By that, the partition > uuids used in the WIC files can be kept in sync with the uuids used in > the sw-description file. This helps to avoid issues where the part uuids > are inconsistent and hence the update using swupdate fails. > > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> > --- > Changes since v2: > > - rebased against current next > > Changes since v1: > > - fix: add ABROOTFS_PART_UUID_(A|B) to template vars for sw-description > - removed initialisation of variables from swupdate.inc file, as the > check will catch it anyways > - simplified check for uuid values > > I decided against the recommendation to move the UUID out of the swupdate.yml > kas file, because this would introduce yet another pattern how to handle things. > Downstream users are free to use a different method, but als long as CIP-Core > handles all globals via KAS, we should not diverge. > > Best regards, > Felix > > kas/opt/swupdate.yml | 2 ++ > recipes-core/images/files/sw-description.tmpl | 2 +- > recipes-core/images/swupdate.inc | 8 +++++++- > wic/bbb-efibootguard.wks.in | 4 ++-- > wic/qemu-amd64-efibootguard-secureboot.wks.in | 4 ++-- > wic/qemu-arm64-efibootguard-secureboot.wks.in | 4 ++-- > wic/qemu-arm64-efibootguard.wks.in | 4 ++-- > wic/x86-efibootguard.wks.in | 4 ++-- > 8 files changed, 20 insertions(+), 12 deletions(-) > > diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml > index f0d3f1b..60a4aec 100644 > --- a/kas/opt/swupdate.yml > +++ b/kas/opt/swupdate.yml > @@ -25,3 +25,5 @@ local_conf_header: > WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks.in" > INITRAMFS_INSTALL_append = " initramfs-squashfs-hook" > WIC_DEPLOY_PARTITIONS = "1" > + ABROOTFS_PART_UUID_A ?= "fedcba98-7654-3210-cafe-5e0710000001" > + ABROOTFS_PART_UUID_B ?= "fedcba98-7654-3210-cafe-5e0710000002" > diff --git a/recipes-core/images/files/sw-description.tmpl b/recipes-core/images/files/sw-description.tmpl > index f7105c7..05125e6 100644 > --- a/recipes-core/images/files/sw-description.tmpl > +++ b/recipes-core/images/files/sw-description.tmpl > @@ -14,7 +14,7 @@ software = > name = "cip software update"; > images: ({ > filename = "${ROOTFS_PARTITION_NAME}"; > - device = "C:BOOT0:linux.efi->fedcba98-7654-3210-cafe-5e0710000001,C:BOOT1:linux.efi->fedcba98-7654-3210-cafe-5e0710000002"; > + device = "C:BOOT0:linux.efi->${ABROOTFS_PART_UUID_A},C:BOOT1:linux.efi->${ABROOTFS_PART_UUID_B}"; > type = "roundrobin"; > compressed = "zlib"; > filesystem = "ext4"; > diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc > index 0ba3a0e..9b2aedc 100644 > --- a/recipes-core/images/swupdate.inc > +++ b/recipes-core/images/swupdate.inc > @@ -26,6 +26,12 @@ TEMPLATE_FILES += "sw-description.tmpl" > do_transform_template[vardeps] += "TARGET_IMAGE_UUID" > addtask do_transform_template before do_swupdate_binary after do_generate_image_uuid > > -TEMPLATE_VARS += "ROOTFS_PARTITION_NAME TARGET_IMAGE_UUID" > +TEMPLATE_VARS += "ROOTFS_PARTITION_NAME TARGET_IMAGE_UUID ABROOTFS_PART_UUID_A ABROOTFS_PART_UUID_B" > > SWU_ADDITIONAL_FILES += "linux.efi ${ROOTFS_PARTITION_NAME}" > + > +python() { > + for u in ['A', 'B']: > + if not d.getVar('ABROOTFS_PART_UUID_' + u): > + bb.fatal('ABROOTFS_PART_UUID_' + u + ' not set') > +} > diff --git a/wic/bbb-efibootguard.wks.in b/wic/bbb-efibootguard.wks.in > index 8a8de50..bb893d4 100644 > --- a/wic/bbb-efibootguard.wks.in > +++ b/wic/bbb-efibootguard.wks.in > @@ -11,8 +11,8 @@ part --source rawcopy --sourceparams "file=/usr/lib/u-boot/bbb/u-boot.img" --no- > > include ebg-sysparts.inc > > -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" > +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" > +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" > > # home and var are extra partitions > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home --align 1024 --size 1G > diff --git a/wic/qemu-amd64-efibootguard-secureboot.wks.in b/wic/qemu-amd64-efibootguard-secureboot.wks.in > index ba7846c..5c41116 100644 > --- a/wic/qemu-amd64-efibootguard-secureboot.wks.in > +++ b/wic/qemu-amd64-efibootguard-secureboot.wks.in > @@ -1,7 +1,7 @@ > include ebg-signed-sysparts.inc > > -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" > +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" > +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" > > # home and var are extra partitions > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home --align 1024 --size 1G > diff --git a/wic/qemu-arm64-efibootguard-secureboot.wks.in b/wic/qemu-arm64-efibootguard-secureboot.wks.in > index 80a7803..a58928a 100644 > --- a/wic/qemu-arm64-efibootguard-secureboot.wks.in > +++ b/wic/qemu-arm64-efibootguard-secureboot.wks.in > @@ -1,7 +1,7 @@ > include ebg-signed-sysparts.inc > > -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" > +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" > +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" > > # home and var are extra partitions > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home --align 1024 --size 1G > diff --git a/wic/qemu-arm64-efibootguard.wks.in b/wic/qemu-arm64-efibootguard.wks.in > index 53ab568..bcd736e 100644 > --- a/wic/qemu-arm64-efibootguard.wks.in > +++ b/wic/qemu-arm64-efibootguard.wks.in > @@ -3,8 +3,8 @@ > > include ebg-sysparts.inc > > -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" > +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" > +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" > > # home and var are extra partitions > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home --align 1024 --size 1G > diff --git a/wic/x86-efibootguard.wks.in b/wic/x86-efibootguard.wks.in > index 38f7cce..683d7a8 100644 > --- a/wic/x86-efibootguard.wks.in > +++ b/wic/x86-efibootguard.wks.in > @@ -3,8 +3,8 @@ > > include ebg-sysparts.inc > > -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" > +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" > +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" > > # home and var are extra partitions > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home1 --align 1024 --size 1G This looks like a typo in label: home1 Quirin
On Thu, 2023-01-19 at 12:44 +0100, Gylstorff Quirin wrote: > > > On 1/18/23 10:04, Felix Moessbauer wrote: > > This patch converts the abrootfs partition uuids to a template and > > adds > > two global variables to control their values. By that, the > > partition > > uuids used in the WIC files can be kept in sync with the uuids used > > in > > the sw-description file. This helps to avoid issues where the part > > uuids > > are inconsistent and hence the update using swupdate fails. > > > > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> > > --- > > Changes since v2: > > > > - rebased against current next > > > > Changes since v1: > > > > - fix: add ABROOTFS_PART_UUID_(A|B) to template vars for sw- > > description > > - removed initialisation of variables from swupdate.inc file, as > > the > > check will catch it anyways > > - simplified check for uuid values > > > > I decided against the recommendation to move the UUID out of the > > swupdate.yml > > kas file, because this would introduce yet another pattern how to > > handle things. > > Downstream users are free to use a different method, but als long > > as CIP-Core > > handles all globals via KAS, we should not diverge. > > > > Best regards, > > Felix > > > > kas/opt/swupdate.yml | 2 ++ > > recipes-core/images/files/sw-description.tmpl | 2 +- > > recipes-core/images/swupdate.inc | 8 +++++++- > > wic/bbb-efibootguard.wks.in | 4 ++-- > > wic/qemu-amd64-efibootguard-secureboot.wks.in | 4 ++-- > > wic/qemu-arm64-efibootguard-secureboot.wks.in | 4 ++-- > > wic/qemu-arm64-efibootguard.wks.in | 4 ++-- > > wic/x86-efibootguard.wks.in | 4 ++-- > > 8 files changed, 20 insertions(+), 12 deletions(-) > > > > diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml > > index f0d3f1b..60a4aec 100644 > > --- a/kas/opt/swupdate.yml > > +++ b/kas/opt/swupdate.yml > > @@ -25,3 +25,5 @@ local_conf_header: > > WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks.in" > > INITRAMFS_INSTALL_append = " initramfs-squashfs-hook" > > WIC_DEPLOY_PARTITIONS = "1" > > + ABROOTFS_PART_UUID_A ?= "fedcba98-7654-3210-cafe-5e0710000001" > > + ABROOTFS_PART_UUID_B ?= "fedcba98-7654-3210-cafe-5e0710000002" > > diff --git a/recipes-core/images/files/sw-description.tmpl > > b/recipes-core/images/files/sw-description.tmpl > > index f7105c7..05125e6 100644 > > --- a/recipes-core/images/files/sw-description.tmpl > > +++ b/recipes-core/images/files/sw-description.tmpl > > @@ -14,7 +14,7 @@ software = > > name = "cip software update"; > > images: ({ > > filename = "${ROOTFS_PARTITION_NAME}"; > > - device = "C:BOOT0:linux.efi->fedcba98-7654-3210-cafe- > > 5e0710000001,C:BOOT1:linux.efi->fedcba98-7654-3210-cafe- > > 5e0710000002"; > > + device = "C:BOOT0:linux.efi- > > >${ABROOTFS_PART_UUID_A},C:BOOT1:linux.efi- > > >${ABROOTFS_PART_UUID_B}"; > > type = "roundrobin"; > > compressed = "zlib"; > > filesystem = "ext4"; > > diff --git a/recipes-core/images/swupdate.inc b/recipes- > > core/images/swupdate.inc > > index 0ba3a0e..9b2aedc 100644 > > --- a/recipes-core/images/swupdate.inc > > +++ b/recipes-core/images/swupdate.inc > > @@ -26,6 +26,12 @@ TEMPLATE_FILES += "sw-description.tmpl" > > do_transform_template[vardeps] += "TARGET_IMAGE_UUID" > > addtask do_transform_template before do_swupdate_binary after > > do_generate_image_uuid > > > > -TEMPLATE_VARS += "ROOTFS_PARTITION_NAME TARGET_IMAGE_UUID" > > +TEMPLATE_VARS += "ROOTFS_PARTITION_NAME TARGET_IMAGE_UUID > > ABROOTFS_PART_UUID_A ABROOTFS_PART_UUID_B" > > > > SWU_ADDITIONAL_FILES += "linux.efi ${ROOTFS_PARTITION_NAME}" > > + > > +python() { > > + for u in ['A', 'B']: > > + if not d.getVar('ABROOTFS_PART_UUID_' + u): > > + bb.fatal('ABROOTFS_PART_UUID_' + u + ' not set') > > +} > > diff --git a/wic/bbb-efibootguard.wks.in b/wic/bbb- > > efibootguard.wks.in > > index 8a8de50..bb893d4 100644 > > --- a/wic/bbb-efibootguard.wks.in > > +++ b/wic/bbb-efibootguard.wks.in > > @@ -11,8 +11,8 @@ part --source rawcopy --sourceparams > > "file=/usr/lib/u-boot/bbb/u-boot.img" --no- > > > > include ebg-sysparts.inc > > > > -part --source rawcopy --sourceparams > > "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G -- > > uuid "fedcba98-7654-3210-cafe-5e0710000001" > > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98- > > 7654-3210-cafe-5e0710000002" > > +part --source rawcopy --sourceparams > > "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G -- > > uuid "${ABROOTFS_PART_UUID_A}" > > +part --source empty --align 1024 --fixed-size 1G --uuid > > "${ABROOTFS_PART_UUID_B}" > > > > # home and var are extra partitions > > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home -- > > fstype=ext4 --label home --align 1024 --size 1G > > diff --git a/wic/qemu-amd64-efibootguard-secureboot.wks.in > > b/wic/qemu-amd64-efibootguard-secureboot.wks.in > > index ba7846c..5c41116 100644 > > --- a/wic/qemu-amd64-efibootguard-secureboot.wks.in > > +++ b/wic/qemu-amd64-efibootguard-secureboot.wks.in > > @@ -1,7 +1,7 @@ > > include ebg-signed-sysparts.inc > > > > -part --source rawcopy --sourceparams > > "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid > > "fedcba98-7654-3210-cafe-5e0710000001" > > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98- > > 7654-3210-cafe-5e0710000002" > > +part --source rawcopy --sourceparams > > "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid > > "${ABROOTFS_PART_UUID_A}" > > +part --source empty --align 1024 --fixed-size 1G --uuid > > "${ABROOTFS_PART_UUID_B}" > > > > # home and var are extra partitions > > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home -- > > fstype=ext4 --label home --align 1024 --size 1G > > diff --git a/wic/qemu-arm64-efibootguard-secureboot.wks.in > > b/wic/qemu-arm64-efibootguard-secureboot.wks.in > > index 80a7803..a58928a 100644 > > --- a/wic/qemu-arm64-efibootguard-secureboot.wks.in > > +++ b/wic/qemu-arm64-efibootguard-secureboot.wks.in > > @@ -1,7 +1,7 @@ > > include ebg-signed-sysparts.inc > > > > -part --source rawcopy --sourceparams > > "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid > > "fedcba98-7654-3210-cafe-5e0710000001" > > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98- > > 7654-3210-cafe-5e0710000002" > > +part --source rawcopy --sourceparams > > "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid > > "${ABROOTFS_PART_UUID_A}" > > +part --source empty --align 1024 --fixed-size 1G --uuid > > "${ABROOTFS_PART_UUID_B}" > > > > # home and var are extra partitions > > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home -- > > fstype=ext4 --label home --align 1024 --size 1G > > diff --git a/wic/qemu-arm64-efibootguard.wks.in b/wic/qemu-arm64- > > efibootguard.wks.in > > index 53ab568..bcd736e 100644 > > --- a/wic/qemu-arm64-efibootguard.wks.in > > +++ b/wic/qemu-arm64-efibootguard.wks.in > > @@ -3,8 +3,8 @@ > > > > include ebg-sysparts.inc > > > > -part --source rawcopy --sourceparams > > "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G -- > > uuid "fedcba98-7654-3210-cafe-5e0710000001" > > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98- > > 7654-3210-cafe-5e0710000002" > > +part --source rawcopy --sourceparams > > "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G -- > > uuid "${ABROOTFS_PART_UUID_A}" > > +part --source empty --align 1024 --fixed-size 1G --uuid > > "${ABROOTFS_PART_UUID_B}" > > > > # home and var are extra partitions > > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home -- > > fstype=ext4 --label home --align 1024 --size 1G > > diff --git a/wic/x86-efibootguard.wks.in b/wic/x86- > > efibootguard.wks.in > > index 38f7cce..683d7a8 100644 > > --- a/wic/x86-efibootguard.wks.in > > +++ b/wic/x86-efibootguard.wks.in > > @@ -3,8 +3,8 @@ > > > > include ebg-sysparts.inc > > > > -part --source rawcopy --sourceparams > > "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G -- > > uuid "fedcba98-7654-3210-cafe-5e0710000001" > > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98- > > 7654-3210-cafe-5e0710000002" > > +part --source rawcopy --sourceparams > > "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G -- > > uuid "${ABROOTFS_PART_UUID_A}" > > +part --source empty --align 1024 --fixed-size 1G --uuid > > "${ABROOTFS_PART_UUID_B}" > > > > # home and var are extra partitions > > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home -- > > fstype=ext4 --label home1 --align 1024 --size 1G > > This looks like a typo in label: home1 True, but not part of this patch. Please let us fix individually and not as part of this series. Felix > > Quirin
On 18.01.23 10:04, Felix Moessbauer wrote: > This patch converts the abrootfs partition uuids to a template and adds > two global variables to control their values. By that, the partition > uuids used in the WIC files can be kept in sync with the uuids used in > the sw-description file. This helps to avoid issues where the part uuids > are inconsistent and hence the update using swupdate fails. > > Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> > --- > Changes since v2: > > - rebased against current next > > Changes since v1: > > - fix: add ABROOTFS_PART_UUID_(A|B) to template vars for sw-description > - removed initialisation of variables from swupdate.inc file, as the > check will catch it anyways > - simplified check for uuid values > > I decided against the recommendation to move the UUID out of the swupdate.yml > kas file, because this would introduce yet another pattern how to handle things. > Downstream users are free to use a different method, but als long as CIP-Core > handles all globals via KAS, we should not diverge. > > Best regards, > Felix > > kas/opt/swupdate.yml | 2 ++ > recipes-core/images/files/sw-description.tmpl | 2 +- > recipes-core/images/swupdate.inc | 8 +++++++- > wic/bbb-efibootguard.wks.in | 4 ++-- > wic/qemu-amd64-efibootguard-secureboot.wks.in | 4 ++-- > wic/qemu-arm64-efibootguard-secureboot.wks.in | 4 ++-- > wic/qemu-arm64-efibootguard.wks.in | 4 ++-- > wic/x86-efibootguard.wks.in | 4 ++-- > 8 files changed, 20 insertions(+), 12 deletions(-) > > diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml > index f0d3f1b..60a4aec 100644 > --- a/kas/opt/swupdate.yml > +++ b/kas/opt/swupdate.yml > @@ -25,3 +25,5 @@ local_conf_header: > WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks.in" > INITRAMFS_INSTALL_append = " initramfs-squashfs-hook" > WIC_DEPLOY_PARTITIONS = "1" > + ABROOTFS_PART_UUID_A ?= "fedcba98-7654-3210-cafe-5e0710000001" > + ABROOTFS_PART_UUID_B ?= "fedcba98-7654-3210-cafe-5e0710000002" > diff --git a/recipes-core/images/files/sw-description.tmpl b/recipes-core/images/files/sw-description.tmpl > index f7105c7..05125e6 100644 > --- a/recipes-core/images/files/sw-description.tmpl > +++ b/recipes-core/images/files/sw-description.tmpl > @@ -14,7 +14,7 @@ software = > name = "cip software update"; > images: ({ > filename = "${ROOTFS_PARTITION_NAME}"; > - device = "C:BOOT0:linux.efi->fedcba98-7654-3210-cafe-5e0710000001,C:BOOT1:linux.efi->fedcba98-7654-3210-cafe-5e0710000002"; > + device = "C:BOOT0:linux.efi->${ABROOTFS_PART_UUID_A},C:BOOT1:linux.efi->${ABROOTFS_PART_UUID_B}"; > type = "roundrobin"; > compressed = "zlib"; > filesystem = "ext4"; > diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc > index 0ba3a0e..9b2aedc 100644 > --- a/recipes-core/images/swupdate.inc > +++ b/recipes-core/images/swupdate.inc > @@ -26,6 +26,12 @@ TEMPLATE_FILES += "sw-description.tmpl" > do_transform_template[vardeps] += "TARGET_IMAGE_UUID" > addtask do_transform_template before do_swupdate_binary after do_generate_image_uuid > > -TEMPLATE_VARS += "ROOTFS_PARTITION_NAME TARGET_IMAGE_UUID" > +TEMPLATE_VARS += "ROOTFS_PARTITION_NAME TARGET_IMAGE_UUID ABROOTFS_PART_UUID_A ABROOTFS_PART_UUID_B" > > SWU_ADDITIONAL_FILES += "linux.efi ${ROOTFS_PARTITION_NAME}" > + > +python() { > + for u in ['A', 'B']: > + if not d.getVar('ABROOTFS_PART_UUID_' + u): > + bb.fatal('ABROOTFS_PART_UUID_' + u + ' not set') > +} > diff --git a/wic/bbb-efibootguard.wks.in b/wic/bbb-efibootguard.wks.in > index 8a8de50..bb893d4 100644 > --- a/wic/bbb-efibootguard.wks.in > +++ b/wic/bbb-efibootguard.wks.in > @@ -11,8 +11,8 @@ part --source rawcopy --sourceparams "file=/usr/lib/u-boot/bbb/u-boot.img" --no- > > include ebg-sysparts.inc > > -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" > +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" > +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" > > # home and var are extra partitions > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home --align 1024 --size 1G > diff --git a/wic/qemu-amd64-efibootguard-secureboot.wks.in b/wic/qemu-amd64-efibootguard-secureboot.wks.in > index ba7846c..5c41116 100644 > --- a/wic/qemu-amd64-efibootguard-secureboot.wks.in > +++ b/wic/qemu-amd64-efibootguard-secureboot.wks.in > @@ -1,7 +1,7 @@ > include ebg-signed-sysparts.inc > > -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" > +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" > +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" > > # home and var are extra partitions > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home --align 1024 --size 1G > diff --git a/wic/qemu-arm64-efibootguard-secureboot.wks.in b/wic/qemu-arm64-efibootguard-secureboot.wks.in > index 80a7803..a58928a 100644 > --- a/wic/qemu-arm64-efibootguard-secureboot.wks.in > +++ b/wic/qemu-arm64-efibootguard-secureboot.wks.in > @@ -1,7 +1,7 @@ > include ebg-signed-sysparts.inc > > -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" > +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" > +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" > > # home and var are extra partitions > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home --align 1024 --size 1G > diff --git a/wic/qemu-arm64-efibootguard.wks.in b/wic/qemu-arm64-efibootguard.wks.in > index 53ab568..bcd736e 100644 > --- a/wic/qemu-arm64-efibootguard.wks.in > +++ b/wic/qemu-arm64-efibootguard.wks.in > @@ -3,8 +3,8 @@ > > include ebg-sysparts.inc > > -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" > +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" > +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" > > # home and var are extra partitions > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home --align 1024 --size 1G > diff --git a/wic/x86-efibootguard.wks.in b/wic/x86-efibootguard.wks.in > index 38f7cce..683d7a8 100644 > --- a/wic/x86-efibootguard.wks.in > +++ b/wic/x86-efibootguard.wks.in > @@ -3,8 +3,8 @@ > > include ebg-sysparts.inc > > -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" > -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" > +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" > +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" > > # home and var are extra partitions > part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home1 --align 1024 --size 1G Thanks, applied. Jan
diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml index f0d3f1b..60a4aec 100644 --- a/kas/opt/swupdate.yml +++ b/kas/opt/swupdate.yml @@ -25,3 +25,5 @@ local_conf_header: WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks.in" INITRAMFS_INSTALL_append = " initramfs-squashfs-hook" WIC_DEPLOY_PARTITIONS = "1" + ABROOTFS_PART_UUID_A ?= "fedcba98-7654-3210-cafe-5e0710000001" + ABROOTFS_PART_UUID_B ?= "fedcba98-7654-3210-cafe-5e0710000002" diff --git a/recipes-core/images/files/sw-description.tmpl b/recipes-core/images/files/sw-description.tmpl index f7105c7..05125e6 100644 --- a/recipes-core/images/files/sw-description.tmpl +++ b/recipes-core/images/files/sw-description.tmpl @@ -14,7 +14,7 @@ software = name = "cip software update"; images: ({ filename = "${ROOTFS_PARTITION_NAME}"; - device = "C:BOOT0:linux.efi->fedcba98-7654-3210-cafe-5e0710000001,C:BOOT1:linux.efi->fedcba98-7654-3210-cafe-5e0710000002"; + device = "C:BOOT0:linux.efi->${ABROOTFS_PART_UUID_A},C:BOOT1:linux.efi->${ABROOTFS_PART_UUID_B}"; type = "roundrobin"; compressed = "zlib"; filesystem = "ext4"; diff --git a/recipes-core/images/swupdate.inc b/recipes-core/images/swupdate.inc index 0ba3a0e..9b2aedc 100644 --- a/recipes-core/images/swupdate.inc +++ b/recipes-core/images/swupdate.inc @@ -26,6 +26,12 @@ TEMPLATE_FILES += "sw-description.tmpl" do_transform_template[vardeps] += "TARGET_IMAGE_UUID" addtask do_transform_template before do_swupdate_binary after do_generate_image_uuid -TEMPLATE_VARS += "ROOTFS_PARTITION_NAME TARGET_IMAGE_UUID" +TEMPLATE_VARS += "ROOTFS_PARTITION_NAME TARGET_IMAGE_UUID ABROOTFS_PART_UUID_A ABROOTFS_PART_UUID_B" SWU_ADDITIONAL_FILES += "linux.efi ${ROOTFS_PARTITION_NAME}" + +python() { + for u in ['A', 'B']: + if not d.getVar('ABROOTFS_PART_UUID_' + u): + bb.fatal('ABROOTFS_PART_UUID_' + u + ' not set') +} diff --git a/wic/bbb-efibootguard.wks.in b/wic/bbb-efibootguard.wks.in index 8a8de50..bb893d4 100644 --- a/wic/bbb-efibootguard.wks.in +++ b/wic/bbb-efibootguard.wks.in @@ -11,8 +11,8 @@ part --source rawcopy --sourceparams "file=/usr/lib/u-boot/bbb/u-boot.img" --no- include ebg-sysparts.inc -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" # home and var are extra partitions part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home --align 1024 --size 1G diff --git a/wic/qemu-amd64-efibootguard-secureboot.wks.in b/wic/qemu-amd64-efibootguard-secureboot.wks.in index ba7846c..5c41116 100644 --- a/wic/qemu-amd64-efibootguard-secureboot.wks.in +++ b/wic/qemu-amd64-efibootguard-secureboot.wks.in @@ -1,7 +1,7 @@ include ebg-signed-sysparts.inc -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" # home and var are extra partitions part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home --align 1024 --size 1G diff --git a/wic/qemu-arm64-efibootguard-secureboot.wks.in b/wic/qemu-arm64-efibootguard-secureboot.wks.in index 80a7803..a58928a 100644 --- a/wic/qemu-arm64-efibootguard-secureboot.wks.in +++ b/wic/qemu-arm64-efibootguard-secureboot.wks.in @@ -1,7 +1,7 @@ include ebg-signed-sysparts.inc -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.verity" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" # home and var are extra partitions part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home --align 1024 --size 1G diff --git a/wic/qemu-arm64-efibootguard.wks.in b/wic/qemu-arm64-efibootguard.wks.in index 53ab568..bcd736e 100644 --- a/wic/qemu-arm64-efibootguard.wks.in +++ b/wic/qemu-arm64-efibootguard.wks.in @@ -3,8 +3,8 @@ include ebg-sysparts.inc -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" # home and var are extra partitions part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home --align 1024 --size 1G diff --git a/wic/x86-efibootguard.wks.in b/wic/x86-efibootguard.wks.in index 38f7cce..683d7a8 100644 --- a/wic/x86-efibootguard.wks.in +++ b/wic/x86-efibootguard.wks.in @@ -3,8 +3,8 @@ include ebg-sysparts.inc -part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000001" -part --source empty --align 1024 --fixed-size 1G --uuid "fedcba98-7654-3210-cafe-5e0710000002" +part --source rawcopy --sourceparams "file=${IMAGE_FULLNAME}.squashfs" --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_A}" +part --source empty --align 1024 --fixed-size 1G --uuid "${ABROOTFS_PART_UUID_B}" # home and var are extra partitions part /home --source rootfs --rootfs-dir=${IMAGE_ROOTFS}/home --fstype=ext4 --label home1 --align 1024 --size 1G
This patch converts the abrootfs partition uuids to a template and adds two global variables to control their values. By that, the partition uuids used in the WIC files can be kept in sync with the uuids used in the sw-description file. This helps to avoid issues where the part uuids are inconsistent and hence the update using swupdate fails. Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com> --- Changes since v2: - rebased against current next Changes since v1: - fix: add ABROOTFS_PART_UUID_(A|B) to template vars for sw-description - removed initialisation of variables from swupdate.inc file, as the check will catch it anyways - simplified check for uuid values I decided against the recommendation to move the UUID out of the swupdate.yml kas file, because this would introduce yet another pattern how to handle things. Downstream users are free to use a different method, but als long as CIP-Core handles all globals via KAS, we should not diverge. Best regards, Felix kas/opt/swupdate.yml | 2 ++ recipes-core/images/files/sw-description.tmpl | 2 +- recipes-core/images/swupdate.inc | 8 +++++++- wic/bbb-efibootguard.wks.in | 4 ++-- wic/qemu-amd64-efibootguard-secureboot.wks.in | 4 ++-- wic/qemu-arm64-efibootguard-secureboot.wks.in | 4 ++-- wic/qemu-arm64-efibootguard.wks.in | 4 ++-- wic/x86-efibootguard.wks.in | 4 ++-- 8 files changed, 20 insertions(+), 12 deletions(-)