Re: [PATCH 1/3] wic: locate systemd-boot efi files in buildchroot

[Henning Schild <henning.schild@siemens.com>]

Am Fri, 12 Aug 2022 08:50:37 +0200
schrieb Felix Moessbauer <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)

Reject! Touching a forked file will need that fix upstream first.

Or (more likely) need to play with some variables to make that upstream
code work. Check the diff between the fork and the original, and the
commit history! The code looks a bit weird, the idea is to only insert
a few lines here and there to hopefully be able to keep up with
upstream more easily and avoid merge conflicts.

What you are proposing here is very much against that principle.

Henning

>              else:
>                  raise WicError("unrecognized bootimg-efi-isar
> loader: %s" %