cip-dev.lists.cip-project.org archive mirror
 help / color / mirror / Atom feed
From: "Q. Gylstorff" <Quirin.Gylstorff@siemens.com>
To: cip-dev@lists.cip-project.org, dinesh.kumar@toshiba-tsip.com
Cc: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Subject: [cip-dev][isar-cip-core][PATCH 2/2] kas/opt/efibootguard: Move setting of IMAGE_TYPE
Date: Tue, 28 Sep 2021 20:49:48 +0200	[thread overview]
Message-ID: <20210928184948.737071-3-Quirin.Gylstorff@siemens.com> (raw)
In-Reply-To: <20210928184948.737071-1-Quirin.Gylstorff@siemens.com>

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"
-- 
2.30.2



WARNING: multiple messages have this Message-ID (diff)
From: "Quirin Gylstorff" <quirin.gylstorff@siemens.com>
To: cip-dev@lists.cip-project.org, dinesh.kumar@toshiba-tsip.com
Cc: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Subject: [cip-dev][isar-cip-core][PATCH 2/2] kas/opt/efibootguard: Move setting of IMAGE_TYPE
Date: Tue, 28 Sep 2021 20:49:48 +0200	[thread overview]
Message-ID: <20210928184948.737071-3-Quirin.Gylstorff@siemens.com> (raw)
Message-ID: <20210928184948.CyweMK8GgelNPuFVMaTF1OrJUCtJ1G-3X9DeSeSKkUE@z> (raw)
In-Reply-To: <20210928184948.737071-1-Quirin.Gylstorff@siemens.com>

[-- Attachment #1: Type: text/plain, Size: 1254 bytes --]

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"
-- 
2.30.2


[-- Attachment #2: Type: text/plain, Size: 429 bytes --]


-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6758): https://lists.cip-project.org/g/cip-dev/message/6758
Mute This Topic: https://lists.cip-project.org/mt/85931981/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/10495289/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-


  parent reply	other threads:[~2021-09-28 18:49 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-09-28 18:49 [cip-dev][isar-cip-core][PATCH 0/2] Fix for issue gitlab #14 Quirin Gylstorff
2021-09-28 18:49 ` Q. Gylstorff
2021-09-28 18:49 ` [cip-dev][isar-cip-core][PATCH 1/2] kas/opt/swupdate: Change assignment of IMAGE_TYPE and WKS_FILE Q. Gylstorff
2021-09-28 18:49   ` Quirin Gylstorff
2021-10-04  9:28     ` Jan Kiszka
2021-10-04  9:28       ` Jan Kiszka
2021-10-04 10:37       ` Jan Kiszka
2021-10-04 10:37         ` Jan Kiszka
2021-10-04 12:46         ` Gylstorff Quirin
2021-10-04 12:46           ` Quirin Gylstorff
2021-10-04 13:27         ` [PATCH v2] " Q. Gylstorff
2021-10-04 13:27           ` [cip-dev] " Quirin Gylstorff
2021-10-04 13:44           ` Jan Kiszka
2021-10-04 13:44             ` [cip-dev] " Jan Kiszka
2021-09-28 18:49 ` Q. Gylstorff [this message]
2021-09-28 18:49   ` [cip-dev][isar-cip-core][PATCH 2/2] kas/opt/efibootguard: Move setting of IMAGE_TYPE Quirin Gylstorff
2021-09-28 22:09     ` Jan Kiszka
2021-09-29  7:53       ` Quirin Gylstorff
2021-09-29  7:53         ` Gylstorff Quirin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210928184948.737071-3-Quirin.Gylstorff@siemens.com \
    --to=quirin.gylstorff@siemens.com \
    --cc=cip-dev@lists.cip-project.org \
    --cc=dinesh.kumar@toshiba-tsip.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).