[neon/neon/livecd-rootfs/Neon/release] live-build: Add a largemem subarch that ships a 64k kernel variant by default.

Łukasz 'sil2100' Zemczak null at kde.org
Mon Feb 5 10:40:28 GMT 2024


Git commit 7d5a370ffe8e93d259fcb8734d073a1ae7ab4720 by Łukasz 'sil2100' Zemczak.
Committed on 22/01/2024 at 15:46.
Pushed by jriddell into branch 'Neon/release'.

Add a largemem subarch that ships a 64k kernel variant by default.

M  +9    -0    live-build/auto/config
M  +4    -0    live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early

https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/7d5a370ffe8e93d259fcb8734d073a1ae7ab4720

diff --git a/live-build/auto/config b/live-build/auto/config
index 8ef56701..58990208 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -867,6 +867,9 @@ case $PROJECT in
 						# However, for RISC-V we only offer one kernel
 						variants='ga'
 						;;
+					arm64+largemem)
+						variants='ga-64k hwe-64k'
+						;;
 					*)
 						variants='ga hwe'
 						;;
@@ -879,6 +882,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 4acbe473..177ce8c1 100755
--- a/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
+++ b/live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
@@ -8,6 +8,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



More information about the Neon-commits mailing list