From 0b30131aae305ceaba5b276d9f5e5588c8444531 Mon Sep 17 00:00:00 2001 From: Tobias Heider Date: Thu, 26 Feb 2026 00:19:43 +0100 Subject: [PATCH] Properly handle non -generic kernel and initramfs flavour Determine used flavour by looking at the suffix of kernel. hwe is currently the only one that needs to have a prefix added so we can hardcode that. --- live-build/isobuilder/builder.py | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/live-build/isobuilder/builder.py b/live-build/isobuilder/builder.py index 704c9de9..ed703f28 100644 --- a/live-build/isobuilder/builder.py +++ b/live-build/isobuilder/builder.py @@ -278,19 +278,18 @@ class ISOBuilder: for path in artifact_dir.glob(f"{filename_prefix}*.{ext}"): newname = path.name[len(filename_prefix) :] link(path, newname) - for suffix, prefix in ( - ("-generic", ""), - ("-generic-hwe", "hwe-"), - ): - if artifact_dir.joinpath(f"{filename_prefix}kernel{suffix}").exists(): - link( - artifact_dir.joinpath(f"{filename_prefix}kernel{suffix}"), - f"{prefix}{kernel_name}", - ) - link( - artifact_dir.joinpath(f"{filename_prefix}initrd{suffix}"), - f"{prefix}initrd", - ) + + for kernel_path in artifact_dir.glob(f"{filename_prefix}kernel*"): + suffix = kernel_path.name[len(filename_prefix) + len("kernel") :] + prefix = "hwe-" if suffix.endswith("-hwe") else "" + link( + artifact_dir.joinpath(f"{filename_prefix}kernel{suffix}"), + f"{prefix}{kernel_name}", + ) + link( + artifact_dir.joinpath(f"{filename_prefix}initrd{suffix}"), + f"{prefix}initrd", + ) self._extract_casper_uuids() def make_bootable(self, project: str, capproject: str, subarch: str):