releasing package livecd-rootfs version 26.04.23

changelog for Tobias' change
Properly handle non -generic kernel and initramfs flavour
2026-03-12 18:47:41 +00:00 · 2026-03-02 10:52:01 +13:00 · 2026-02-27 14:40:30 +13:00 · 2026-02-26 02:08:26 +01:00
2 changed files with 19 additions and 13 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,10 @@
 livecd-rootfs (26.04.23) resolute; urgency=medium
  [ Tobias Heider ]
  * Fix ISO builds when KERNEL_FLAVOUR != generic.
 -- Michael Hudson-Doyle <michael.hudson@ubuntu.com>  Mon, 02 Mar 2026 10:51:47 +1300
 livecd-rootfs (26.04.22) resolute; urgency=medium
  [ Oliver Gayot ]
--- 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", ""),
+            for kernel_path in artifact_dir.glob(f"{filename_prefix}kernel*"):
-                ("-generic-hwe", "hwe-"),
+                suffix = kernel_path.name[len(filename_prefix) + len("kernel") :]
-            ):
+                prefix = "hwe-" if suffix.endswith("-hwe") else ""
-                if artifact_dir.joinpath(f"{filename_prefix}kernel{suffix}").exists():
+                link(
-                    link(
+                    artifact_dir.joinpath(f"{filename_prefix}kernel{suffix}"),
-                        artifact_dir.joinpath(f"{filename_prefix}kernel{suffix}"),
+                    f"{prefix}{kernel_name}",
-                        f"{prefix}{kernel_name}",
+                )
-                    )
+                link(
-                    link(
+                    artifact_dir.joinpath(f"{filename_prefix}initrd{suffix}"),
-                        artifact_dir.joinpath(f"{filename_prefix}initrd{suffix}"),
+                    f"{prefix}initrd",
-                        f"{prefix}initrd",
+                )
                    )
        self._extract_casper_uuids()
    def make_bootable(self, project: str, capproject: str, subarch: str):
Author	SHA1	Message	Date
michael.hudson@canonical.com	dad4a04751	releasing package livecd-rootfs version 26.04.23	2026-03-02 10:52:01 +13:00
michael.hudson@canonical.com	9861d393aa	changelog for Tobias' change	2026-02-27 14:40:30 +13:00
Tobias Heider	0b30131aae	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.	2026-02-26 02:08:26 +01:00