From: "Quirin Gylstorff" <quirin.gylstorff@siemens.com>
To: jan.kiszka@siemens.com, cip-dev@lists.cip-project.org
Cc: Quirin Gylstorff <quirin.gylstorff@siemens.com>
Subject: [cip-dev][isar-cip-core][PATCH 2/5] kas/opt: Allow override of WKS_FILE in swupdate option
Date: Thu, 27 May 2021 15:17:38 +0200 [thread overview]
Message-ID: <20210527131741.8828-3-Quirin.Gylstorff@siemens.com> (raw)
In-Reply-To: <20210527131741.8828-1-Quirin.Gylstorff@siemens.com>
[-- Attachment #1: Type: text/plain, Size: 1108 bytes --]
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
This fixes an error if swupdate.yml is used together with
the secureboot options.
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
kas/opt/efibootguard.yml | 2 ++
kas/opt/swupdate.yml | 4 ++--
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/kas/opt/efibootguard.yml b/kas/opt/efibootguard.yml
index 544c740..d5a0e39 100644
--- a/kas/opt/efibootguard.yml
+++ b/kas/opt/efibootguard.yml
@@ -23,4 +23,6 @@ local_conf_header:
efibootguard-wic: |
WDOG_TIMEOUT = "0"
WICVARS += "WDOG_TIMEOUT"
+ IMAGE_TYPE ?= "wic-img"
+ WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
diff --git a/kas/opt/swupdate.yml b/kas/opt/swupdate.yml
index e622972..bd0f6e4 100644
--- a/kas/opt/swupdate.yml
+++ b/kas/opt/swupdate.yml
@@ -19,5 +19,5 @@ local_conf_header:
IMAGE_INSTALL_append = " swupdate"
wic-swu: |
- IMAGE_TYPE ?= "wic-swu-img"
- WKS_FILE = "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
+ IMAGE_TYPE = "wic-swu-img"
+ WKS_FILE ?= "${MACHINE}-${SWUPDATE_BOOTLOADER}.wks"
--
2.20.1
[-- Attachment #2: Type: text/plain, Size: 428 bytes --]
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#6475): https://lists.cip-project.org/g/cip-dev/message/6475
Mute This Topic: https://lists.cip-project.org/mt/83123996/4520388
Group Owner: cip-dev+owner@lists.cip-project.org
Unsubscribe: https://lists.cip-project.org/g/cip-dev/leave/8129055/4520388/727948398/xyzzy [cip-dev@archiver.kernel.org]
-=-=-=-=-=-=-=-=-=-=-=-
next prev parent reply other threads:[~2021-05-27 13:25 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-27 13:17 [cip-dev][isar-cip-core][PATCH 0/5] Add ci for secure-boot and swupdate Quirin Gylstorff
2021-05-27 13:17 ` [cip-dev][isar-cip-core][PATCH 1/5] swupdate-config: add dependency to u-boot-${MACHINE}-config Quirin Gylstorff
2021-05-27 13:17 ` Quirin Gylstorff [this message]
2021-05-31 12:42 ` [cip-dev][isar-cip-core][PATCH 2/5] kas/opt: Allow override of WKS_FILE in swupdate option Jan Kiszka
2021-05-27 13:17 ` [cip-dev][isar-cip-core][PATCH 3/5] .gitlabci.yml: add secureboot build Quirin Gylstorff
2021-05-27 13:17 ` [cip-dev][isar-cip-core][PATCH 4/5] .gitlabci.yml: add swupdate build Quirin Gylstorff
2021-05-27 13:17 ` [cip-dev][isar-cip-core][PATCH 5/5] .gitlabci.yml: Add secure-boot and " Quirin Gylstorff
2021-05-31 12:49 ` [cip-dev][isar-cip-core][PATCH 0/5] Add ci for secure-boot and swupdate Jan Kiszka
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=20210527131741.8828-3-Quirin.Gylstorff@siemens.com \
--to=quirin.gylstorff@siemens.com \
--cc=cip-dev@lists.cip-project.org \
--cc=jan.kiszka@siemens.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.