Re: [isar-cip-core][PATCH 2/2] kas/opt/efibootguard: Move setting of IMAGE_TYPE


Quirin Gylstorff
 

On 9/29/21 12:09 AM, Jan Kiszka wrote:
On 28.09.21 20:49, Quirin Gylstorff wrote:
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>

This seperates the image type from the boot loader.

Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
kas/opt/efibootguard.yml | 1 -
kas/opt/wic-img.yml | 19 +++++++++++++++++++
2 files changed, 19 insertions(+), 1 deletion(-)
create mode 100644 kas/opt/wic-img.yml

diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml
index 705a76d..4e8be69 100644
--- a/kas/opt/efibootguard.yml
+++ b/kas/opt/efibootguard.yml
@@ -23,6 +23,5 @@ local_conf_header:
efibootguard-wic: |
WDOG_TIMEOUT ?= "60"
WICVARS += "WDOG_TIMEOUT"
- IMAGE_TYPE ?= "wic-img"
WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"

diff --git a/kas/opt/wic-img.yml b/kas/opt/wic-img.yml
new file mode 100644
index 0000000..2b02b42
--- /dev/null
+++ b/kas/opt/wic-img.yml
@@ -0,0 +1,19 @@
+#
+# CIP Core, generic profile
+#
+# Copyright (c) Siemens AG, 2021
+#
+# Authors:
+# Quirin Gylstorff <quirin.gylstorff@siemens.com>
+#
+# SPDX-License-Identifier: MIT
+#
+# This kas file set the IMAGE_TYPE to wic-img
+# The device specific WKS_FILE needs to be set seperately.
+
+header:
+ version: 10
+
+local_conf_header:
+ image-type: |
+ IMAGE_TYPE = "wic-img"
What's the purpose of this file? When should a user specify this option?
I think we already have too many option files and rather need to reduce
them than adding more.
My idea was to split the selection of efibootguard from the usage of wic-img so that we can generate other image formats together with efibootguard - in hindsight this is not necessary - you can skip this patch as patch 1 of this set solves the issue alone.


Quirin
Jan
PS: Something is currently off with archiving on lore.kernel.org.
Messages from this thread but also others appear twice there:
https://eur01.safelinks.protection.outlook.com/?url=https%3A%2F%2Flore.kernel.org%2Fcip-dev%2F20210928184946.GHmZQFBkA_wEzR1iQiB_04frBV52DnaYGHOSYtAdjok%40z%2FT%2F%23t&;data=04%7C01%7C6549bcd2-981c-4c06-8e1b-b5c6cc3441b4%40ad011.siemens.com%7Cc59cf4afa01c4ef24ff208d982ccb240%7C38ae3bcd95794fd4addab42e1495d55a%7C1%7C0%7C637684637933939193%7CUnknown%7CTWFpbGZsb3d8eyJWIjoiMC4wLjAwMDAiLCJQIjoiV2luMzIiLCJBTiI6Ik1haWwiLCJXVCI6Mn0%3D%7C1000&amp;sdata=kNC4hyC3dM8p%2BUVHMpaGjs7O%2BmC76P4UKCXcIHMStO8%3D&amp;reserved=0

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