diff mbox series

[isar-cip-core,14/19] swupdate: Switch to bootenv_rrmap+kernelfile for device selection

Message ID 8c6b9776be2e54190b101bd63f12cc22e5d5feaf.1649834193.git.jan.kiszka@siemens.com (mailing list archive)
State New
Headers show
Series SWUpdate & EFI Boot Guard refactorings | expand

Commit Message

Jan Kiszka April 13, 2022, 7:16 a.m. UTC
From: Jan Kiszka <jan.kiszka@siemens.com>

This allows for a medium-independent sw-description. Not required so far
for QEMU, but it may become useful in the future or for downstream
layers, at least as reference.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 recipes-core/images/files/sw-description.tmpl             | 4 ++--
 .../files/swupdate.handler.efibootguard.ini               | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)
diff mbox series

Patch

diff --git a/recipes-core/images/files/sw-description.tmpl b/recipes-core/images/files/sw-description.tmpl
index 7dd67f9..f5cafeb 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 = "sda4,sda5";
+            device = "C:BOOT0:linux.efi->fedcba98-7654-3210-cafe-5e0710000001,C:BOOT1:linux.efi->fedcba98-7654-3210-cafe-5e0710000002";
             type = "roundrobin";
             compressed = "zlib";
             filesystem = "ext4";
@@ -26,7 +26,7 @@  software =
             filename = "linux.efi";
             path = "linux.efi";
             type = "roundrobin";
-            device = "sda4->BOOT0,sda5->BOOT1";
+            device = "C:BOOT0:linux.efi->BOOT0,C:BOOT1:linux.efi->BOOT1";
             filesystem = "vfat";
             properties: {
                         subtype = "kernel";
diff --git a/recipes-core/swupdate-handler-roundrobin/files/swupdate.handler.efibootguard.ini b/recipes-core/swupdate-handler-roundrobin/files/swupdate.handler.efibootguard.ini
index b5e8070..58271da 100644
--- a/recipes-core/swupdate-handler-roundrobin/files/swupdate.handler.efibootguard.ini
+++ b/recipes-core/swupdate-handler-roundrobin/files/swupdate.handler.efibootguard.ini
@@ -2,15 +2,15 @@ 
 chainhandler=raw
 
 [image.selector]
-method=getroot_rr
-key=root
+method=bootenv_rrmap
+key=kernelfile
 
 [kernel]
 chainhandler=rawfile
 
 [kernel.selector]
-method=getroot_rrmap
-key=root
+method=bootenv_rrmap
+key=kernelfile
 
 [kernel.bootenv]
 kernelfile=C:BOOT${rrindex}:linux.efi