From: Felix Moessbauer <felix.moessbauer@siemens.com>
To: isar-users@googlegroups.com
Cc: amikan@ilbers.de, henning.schild@siemens.com,
jan.kiszka@siemens.com,
Felix Moessbauer <felix.moessbauer@siemens.com>
Subject: [PATCH 1/3] wic: locate systemd-boot efi files in buildchroot
Date: Fri, 12 Aug 2022 08:50:37 +0200 [thread overview]
Message-ID: <20220812065040.1580962-2-felix.moessbauer@siemens.com> (raw)
In-Reply-To: <20220812065040.1580962-1-felix.moessbauer@siemens.com>
This patch locates the systemd-boot efi files in the
buildchroot and not the target chroot.
By that, no imager-specifc dependencies have to be installed
in the target rootfs.
Signed-off-by: Felix Moessbauer <felix.moessbauer@siemens.com>
---
meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
index a24e04f3..7a65a98d 100644
--- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
+++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
@@ -415,9 +415,9 @@ class BootimgEFIPlugin(SourcePlugin):
grub_cmd += "reiserfs regexp " + grub_modules
exec_cmd(grub_cmd)
elif source_params['loader'] == 'systemd-boot':
- kernel_dir = os.path.join(rootfs_dir['ROOTFS_DIR'], "usr/lib/systemd/boot/efi/")
- for mod in [x for x in os.listdir(kernel_dir) if x.startswith("systemd-")]:
- cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % (kernel_dir, mod, hdddir, mod[8:])
+ imager_efi_dir = "/usr/lib/systemd/boot/efi/"
+ for mod in [x for x in os.listdir(imager_efi_dir) if x.startswith("systemd-")]:
+ cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % (imager_efi_dir, mod, hdddir, mod[8:])
exec_cmd(cp_cmd, True)
else:
raise WicError("unrecognized bootimg-efi-isar loader: %s" %
--
2.30.2
next prev parent reply other threads:[~2022-08-12 6:50 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-08-12 6:50 [PATCH 0/3] systemd-boot: Locate imager deps " Felix Moessbauer
2022-08-12 6:50 ` Felix Moessbauer [this message]
2022-08-22 11:47 ` [PATCH 1/3] wic: locate systemd-boot efi files " Henning Schild
2022-08-30 8:23 ` Moessbauer, Felix
2022-08-30 15:06 ` Henning Schild
2022-08-12 6:50 ` [PATCH 2/3] Rework imager support for systemd-boot Felix Moessbauer
2022-08-12 6:50 ` [PATCH 3/3] Install systemd-boot into buildchroot for qemuarm Felix Moessbauer
2022-08-12 7:08 ` [PATCH 0/3] systemd-boot: Locate imager deps in buildchroot Bezdeka, Florian
2022-08-12 7:17 ` Moessbauer, Felix
2022-08-22 11:55 ` Henning Schild
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=20220812065040.1580962-2-felix.moessbauer@siemens.com \
--to=felix.moessbauer@siemens.com \
--cc=amikan@ilbers.de \
--cc=henning.schild@siemens.com \
--cc=isar-users@googlegroups.com \
--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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox