diff mbox series

[isar-cip-core,10/19] Unify configuration of secure vs. non-secure SWUpdate

Message ID a3c984c035728ec7b3bcce3dcdd51ef272663685.1649834193.git.jan.kiszka@siemens.com (mailing list archive)
State Handled Elsewhere
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>

The sw-descriptions are practically identical, the roundrobin-handler
ini files are absolutely the same. So drop them and use unified configs.
That allows to drop kas/opt/ebg-secure-boot-base.yml as well.

Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com>
---
 kas/opt/ebg-secure-boot-base.yml              | 20 -----------
 kas/opt/ebg-secure-boot-snakeoil.yml          |  2 +-
 .../files/secure-boot/sw-description.tmpl     | 35 -------------------
 recipes-core/images/secureboot.inc            | 21 -----------
 .../swupdate.handler.efibootguard.ini         | 16 ---------
 5 files changed, 1 insertion(+), 93 deletions(-)
 delete mode 100644 kas/opt/ebg-secure-boot-base.yml
 delete mode 100644 recipes-core/images/files/secure-boot/sw-description.tmpl
 delete mode 100644 recipes-core/images/secureboot.inc
 delete mode 100644 recipes-core/swupdate-handler-roundrobin/files/secureboot/swupdate.handler.efibootguard.ini
diff mbox series

Patch

diff --git a/kas/opt/ebg-secure-boot-base.yml b/kas/opt/ebg-secure-boot-base.yml
deleted file mode 100644
index 299b663..0000000
--- a/kas/opt/ebg-secure-boot-base.yml
+++ /dev/null
@@ -1,20 +0,0 @@ 
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2020
-#
-# Authors:
-#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-header:
-  version: 10
-  includes:
-   - kas/opt/efibootguard.yml
-
-local_conf_header:
-  secure_swu: |
-    SWU_DESCRIPTION = "secureboot"
-    SWUPDATE_ROUND_ROBIN_HANDLER_CONFIG = "secureboot/swupdate.handler.${SWUPDATE_BOOTLOADER}.ini"
diff --git a/kas/opt/ebg-secure-boot-snakeoil.yml b/kas/opt/ebg-secure-boot-snakeoil.yml
index 10414fb..28b3545 100644
--- a/kas/opt/ebg-secure-boot-snakeoil.yml
+++ b/kas/opt/ebg-secure-boot-snakeoil.yml
@@ -12,7 +12,7 @@ 
 header:
   version: 10
   includes:
-   - kas/opt/ebg-secure-boot-base.yml
+   - kas/opt/efibootguard.yml
 
 local_conf_header:
   image-options: |
diff --git a/recipes-core/images/files/secure-boot/sw-description.tmpl b/recipes-core/images/files/secure-boot/sw-description.tmpl
deleted file mode 100644
index 7dc070a..0000000
--- a/recipes-core/images/files/secure-boot/sw-description.tmpl
+++ /dev/null
@@ -1,35 +0,0 @@ 
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2020
-#
-# Authors:
-#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-software =
-{
-    version = "0.2";
-    name = "secure boot update"
-    images: ({
-            filename = "${ROOTFS_PARTITION_NAME}";
-            device = "sda4,sda5";
-            type = "roundrobin";
-            compressed = "zlib";
-            filesystem = "ext4";
-            properties: {
-                        subtype = "image";
-            };
-    });
-    files: ({
-            filename = "linux.efi";
-            path = "linux.efi";
-            type = "roundrobin";
-            device = "sda4->BOOT0,sda5->BOOT1";
-            filesystem = "vfat";
-            properties: {
-                        subtype = "kernel";
-            };
-    })
-}
diff --git a/recipes-core/images/secureboot.inc b/recipes-core/images/secureboot.inc
deleted file mode 100644
index 6182080..0000000
--- a/recipes-core/images/secureboot.inc
+++ /dev/null
@@ -1,21 +0,0 @@ 
-#
-# CIP Core, generic profile
-#
-# Copyright (c) Siemens AG, 2020
-#
-# Authors:
-#  Quirin Gylstorff <quirin.gylstorff@siemens.com>
-#
-# SPDX-License-Identifier: MIT
-#
-
-FILESEXTRAPATHS_prepend := "${THISDIR}/files/secure-boot:"
-
-ROOTFS_PARTITION_NAME = "${IMAGE_FULLNAME}.wic.img.p4.gz"
-
-SRC_URI += "file://sw-description.tmpl"
-TEMPLATE_FILES += "sw-description.tmpl"
-
-TEMPLATE_VARS += "ROOTFS_PARTITION_NAME"
-
-SWU_ADDITIONAL_FILES += "linux.efi ${ROOTFS_PARTITION_NAME}"
diff --git a/recipes-core/swupdate-handler-roundrobin/files/secureboot/swupdate.handler.efibootguard.ini b/recipes-core/swupdate-handler-roundrobin/files/secureboot/swupdate.handler.efibootguard.ini
deleted file mode 100644
index b5e8070..0000000
--- a/recipes-core/swupdate-handler-roundrobin/files/secureboot/swupdate.handler.efibootguard.ini
+++ /dev/null
@@ -1,16 +0,0 @@ 
-[image]
-chainhandler=raw
-
-[image.selector]
-method=getroot_rr
-key=root
-
-[kernel]
-chainhandler=rawfile
-
-[kernel.selector]
-method=getroot_rrmap
-key=root
-
-[kernel.bootenv]
-kernelfile=C:BOOT${rrindex}:linux.efi