[isar-cip-core][PATCH] sw-description: Use Labels for Boot partitions


Quirin Gylstorff
 

From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This allows an update process independent from boot order or
file systems, e.g. if a usb stick is plug in.

As SWUpdate returns only the device identifier in case of device mapper
mount point the `sw-description` for secure boot
still use device identifiers.

This also fixes [1].

[1]: https://gitlab.com/cip-project/cip-core/isar-cip-core/-/issues/16

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
recipes-core/images/files/secure-boot/sw-description.tmpl | 2 +-
recipes-core/images/files/sw-description.tmpl | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/recipes-core/images/files/secure-boot/sw-description.tmpl b/recipes-core/images/files/secure-boot/sw-description.tmpl
index 34a58a3..f8e5375 100644
--- a/recipes-core/images/files/secure-boot/sw-description.tmpl
+++ b/recipes-core/images/files/secure-boot/sw-description.tmpl
@@ -26,7 +26,7 @@ software =
filename = "linux.signed.efi";
path = "linux.signed.efi";
type = "roundrobin";
- device = "sda4->sda2,sda5->sda3";
+ device = "sda4->BOOT0,sda5->BOOT1";
filesystem = "vfat";
properties: {
subtype = "kernel";
diff --git a/recipes-core/images/files/sw-description.tmpl b/recipes-core/images/files/sw-description.tmpl
index 3309271..c44c2a8 100644
--- a/recipes-core/images/files/sw-description.tmpl
+++ b/recipes-core/images/files/sw-description.tmpl
@@ -26,7 +26,7 @@ software =
filename = "${KERNEL_IMAGE}";
path = "vmlinuz";
type = "roundrobin";
- device = "fedcba98-7654-3210-cafe-5e0710000001->sda2,fedcba98-7654-3210-cafe-5e0710000002->sda3";
+ device = "fedcba98-7654-3210-cafe-5e0710000001->BOOT0,fedcba98-7654-3210-cafe-5e0710000002->BOOT1";
filesystem = "vfat";
properties: {
subtype = "kernel";
@@ -36,7 +36,7 @@ software =
filename = "${INITRD_IMAGE}";
path = "${INITRD_IMAGE}";
type = "roundrobin";
- device = "fedcba98-7654-3210-cafe-5e0710000001->sda2,fedcba98-7654-3210-cafe-5e0710000002->sda3";
+ device = "fedcba98-7654-3210-cafe-5e0710000001->BOOT0,fedcba98-7654-3210-cafe-5e0710000002->BOOT1";
filesystem = "vfat";
properties: {
subtype = "initrd";
--
2.30.2

Join cip-dev@lists.cip-project.org to automatically receive all group messages.