[PATCH] wic: remove '.signed' suffix from systemd-* binaries

[Cedric Hombourger]

Starting with trixie, systemd-boot depends on either systemd-boot-efi
or systemd-boot-efi-signed. In the latter, EFI binaries are suffixed
with ".signed". Make the wic plugin drop that suffix while copying
binaries to EFI/BOOT so that generated images get detected as bootable
disks.

Signed-off-by: Cedric Hombourger <cedric.h...@siemens.com>
---
meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py | 5 ++++-
1 file changed, 4 insertions(+), 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 78ae4fb2..446398d0 100644
--- a/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
+++ b/meta/scripts/lib/wic/plugins/source/bootimg-efi-isar.py
@@ -469,7 +469,10 @@ class BootimgEFIPlugin(SourcePlugin):
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:])
+ target = mod[8:]
+ if target.endswith('.signed'):
+ target = target[:-7]
+ cp_cmd = "cp %s/%s %s/EFI/BOOT/%s" % (kernel_dir, mod, hdddir, target)
exec_cmd(cp_cmd, True)

kernel_dir = kernel_dir_orig
--
2.39.5

[Anton Mikanovich]

01/07/2025 19:05, 'Cedric Hombourger' via isar-users wrote:
> Starting with trixie, systemd-boot depends on either systemd-boot-efi
> or systemd-boot-efi-signed. In the latter, EFI binaries are suffixed
> with ".signed". Make the wic plugin drop that suffix while copying
> binaries to EFI/BOOT so that generated images get detected as bootable
> disks.
>
> Signed-off-by: Cedric Hombourger <cedric.h...@siemens.com>

Applied to next, thanks.