public inbox for isar-users@googlegroups.com
 help / color / mirror / Atom feed
From: Felix Moessbauer <felix.moessbauer@siemens.com>
To: isar-users@googlegroups.com
Cc: amikan@ilbers.de, jan.kiszka@siemens.com,
	henning.schild@siemens.com,
	Felix Moessbauer <felix.moessbauer@siemens.com>
Subject: [PATCH v2 2/4] wic: locate systemd-boot efi files in buildchroot
Date: Thu, 15 Sep 2022 17:04:41 +0200	[thread overview]
Message-ID: <20220915150443.887858-3-felix.moessbauer@siemens.com> (raw)
In-Reply-To: <20220915150443.887858-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 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 bdc04547..006c8bc2 100644
--- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
+++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
@@ -438,7 +438,7 @@ class BootimgEFIPlugin(SourcePlugin):
             elif source_params['loader'] == 'systemd-boot':
                 # backup kernel dir before overwriting
                 kernel_dir_orig = kernel_dir
-                kernel_dir = os.path.join(rootfs_dir['ROOTFS_DIR'], "usr/lib/systemd/boot/efi/")
+                kernel_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:])
-- 
2.30.2


  parent reply	other threads:[~2022-09-15 15:04 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-09-15 15:04 [PATCH v2 0/4] systemd-boot: Locate imager deps " Felix Moessbauer
2022-09-15 15:04 ` [PATCH v2 1/4] fix: do not overwrite kernel_dir in efi-isar wic Felix Moessbauer
2022-09-15 15:04 ` Felix Moessbauer [this message]
2022-09-15 15:04 ` [PATCH v2 3/4] Rework imager support for systemd-boot Felix Moessbauer
2022-09-15 15:04 ` [PATCH v2 4/4] Install systemd-boot into buildchroot for qemuarm Felix Moessbauer
2022-09-23 10:28 ` [PATCH v2 0/4] systemd-boot: Locate imager deps in buildchroot Anton Mikanovich

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=20220915150443.887858-3-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