From 8c4ebae358f0b5e42df500cc736b00c8f3f10772 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Mon, 22 Jan 2024 15:00:58 +0100 Subject: [PATCH] Add a largemem subarch that ships a 64k kernel variant by default. --- live-build/auto/config | 12 +++++++++++- .../hooks/03-kernel-metapkg.chroot_early | 4 ++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/live-build/auto/config b/live-build/auto/config index 0f02d37f..45582f6c 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:|\ @@ -945,6 +945,10 @@ case $PROJECT in tegra-igx) variants='tegra-igx' ;; + largemem) + # variants='ga-64k hwe-64k' + variants='ga-64k' + ;; *) # variants='ga hwe' variants='ga' @@ -958,6 +962,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