diff --git a/debian/changelog b/debian/changelog index 00e7f999..ab76f28c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (24.04.22) UNRELEASED; urgency=medium + + * Add a largemem subarch for ubuntu-server that ships a 64k kernel variant + by default (LP: #2050209). + + -- Ɓukasz 'sil2100' Zemczak Thu, 25 Jan 2024 11:01:28 +0100 + livecd-rootfs (24.04.21) noble; urgency=medium * live-build/functions: avoid losetup -P as it appears to race with udev and diff --git a/live-build/auto/config b/live-build/auto/config index 5729fae7..eec29519 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -4,7 +4,7 @@ set -e case $ARCH:$SUBARCH in amd64:|amd64:generic|amd64:intel-iot|\ arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|\ - arm64:tegra|arm64:tegra-igx|arm64:x13s|\ + arm64:tegra|arm64:tegra-igx|arm64:x13s|arm64:largemem|\ armhf:|\ i386:|\ ppc64el:|\ @@ -951,6 +951,10 @@ case $PROJECT in tegra-igx) variants='tegra-igx' ;; + largemem) + # variants='ga-64k hwe-64k' + variants='ga-64k' + ;; *) # variants='ga hwe' variants='ga' @@ -964,6 +968,12 @@ case $PROJECT in elif [ "$variant" = "hwe" ]; then kernel_metapkg=linux-generic-hwe-$(lsb_release -sr) flavor=generic-hwe + elif [ "$variant" = "ga-64k" ]; then + kernel_metapkg=linux-generic-64k + flavor=generic-64k + elif [ "$variant" = "hwe-64k" ]; then + kernel_metapkg=linux-generic-64k-hwe-$(lsb_release -sr) + flavor=generic-64k-hwe elif [ "$variant" = "intel" ]; then kernel_metapkg=linux-intel-iotg flavor=intel-iotg diff --git a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early index 3e105b35..e8e3a796 100755 --- a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early +++ b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early @@ -11,6 +11,10 @@ case $PASS in kernel_metapkg=linux-generic elif [ "$flavor" = "generic-hwe" ]; then kernel_metapkg=linux-generic-hwe-$(lsb_release -sr) + elif [ "$flavor" = "generic-64k" ]; then + kernel_metapkg=linux-generic-64k + elif [ "$flavor" = "generic-64k-hwe" ]; then + kernel_metapkg=linux-generic-64k-hwe-$(lsb_release -sr) elif [ "$flavor" = "intel-iotg" ]; then kernel_metapkg=linux-intel-iotg elif [ "$flavor" = "nvidia-tegra" ]; then