From: Quirin Gylstorff <Quirin.Gylstorff@siemens.com>
To: jan.kiszka@siemens.com, hannah.kiekens@essensium.com,
cip-dev@lists.cip-project.org, tobias.schaffner@siemens.com
Subject: [cip-core][isar-cip-core][PATCH] fix: swupdate_2021.11 with efibootguard
Date: Mon, 15 Apr 2024 11:54:19 +0200 [thread overview]
Message-ID: <20240415095749.572576-1-Quirin.Gylstorff@siemens.com> (raw)
From: Quirin Gylstorff <quirin.gylstorff@siemens.com>
This fixes a regression introduced with
5e2c207abae61e073bc732d0b93ba390891cd0c7 by readding the bootloader
selection with DEB_BUILD_PROFILES for SWUpdate 2021.11.
SWUpdate 2021.11 selects the bootloader at compile time instead
of runtime. This fixes the following error message during installing
a binary update:
[INFO ] : SWUPDATE running : Installation in progress
[TRACE] : SWUPDATE running : [install_single_image] : Found installer
for stream cip-core-image-cip-core-bookworm-qemu-amd64.squashfs roundrobin
[TRACE] : SWUPDATE running : [notify_helper] : Round Robin Handler: No
compiled-in config found, trying /etc/swupdate.handler.ini
[ERROR] : SWUPDATE failed [0] ERROR : Round Robin Handler: Error getting
key 'kernelfile' from bootloader environment.
Signed-off-by: Quirin Gylstorff <quirin.gylstorff@siemens.com>
---
recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb b/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb
index 0039116..bb98ede 100644
--- a/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb
+++ b/recipes-core/swupdate/swupdate_2021.11-1+debian-gbp.bb
@@ -33,6 +33,15 @@ SRC_URI += "file://0001-debian-Remove-SWUpdate-USB-service-and-Udev-rules.patch
# DEPENDS += "swupdate-handlers"
# GBP_DEPENDS += "swupdate-handlers"
# DEB_BUILD_PROFILES += "pkg.swupdate.embeddedlua"
+def get_bootloader_build_profile(d):
+ bootloader = d.getVar("SWUPDATE_BOOTLOADER") or ""
+ if bootloader == "efibootguard":
+ return "pkg.swupdate.efibootguard"
+ if bootloader == "u-boot":
+ return "pkg.swupdate.uboot"
+ return ""
+
+DEB_BUILD_PROFILES += "${@get_bootloader_build_profile(d)}"
# modify for debian buster build
SRC_URI:append = " file://0006-debian-prepare-build-for-isar-debian-buster.patch"
--
2.43.0
next reply other threads:[~2024-04-15 9:57 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-04-15 9:54 Quirin Gylstorff [this message]
2024-04-16 16:34 ` [cip-core][isar-cip-core][PATCH] fix: swupdate_2021.11 with efibootguard 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=20240415095749.572576-1-Quirin.Gylstorff@siemens.com \
--to=quirin.gylstorff@siemens.com \
--cc=cip-dev@lists.cip-project.org \
--cc=hannah.kiekens@essensium.com \
--cc=jan.kiszka@siemens.com \
--cc=tobias.schaffner@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 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 read-only IMAP folder(s) and NNTP newsgroup(s).