Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-23 11:21:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'noble-64k' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2024-01-25 11:59:25 +01:00
commit 54100874a4
3 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -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 <lukasz.zemczak@ubuntu.com> Thu, 25 Jan 2024 11:01:28 +0100
livecd-rootfs (24.04.21) noble; urgency=medium livecd-rootfs (24.04.21) noble; urgency=medium
* live-build/functions: avoid losetup -P as it appears to race with udev and * live-build/functions: avoid losetup -P as it appears to race with udev and

12
live-build/auto/config
View File

@ -4,7 +4,7 @@ set -e
case $ARCH:$SUBARCH in case $ARCH:$SUBARCH in
amd64:|amd64:generic|amd64:intel-iot|\ amd64:|amd64:generic|amd64:intel-iot|\
arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|\ arm64:|arm64:generic|arm64:raspi|arm64:snapdragon|\
arm64:tegra|arm64:tegra-igx|arm64:x13s|\ arm64:tegra|arm64:tegra-igx|arm64:x13s|arm64:largemem|\
armhf:|\ armhf:|\
i386:|\ i386:|\
ppc64el:|\ ppc64el:|\
@ -951,6 +951,10 @@ case $PROJECT in
tegra-igx) tegra-igx)
variants='tegra-igx' variants='tegra-igx'
;; ;;
largemem)
# variants='ga-64k hwe-64k'
variants='ga-64k'
;;
*) *)
# variants='ga hwe' # variants='ga hwe'
variants='ga' variants='ga'
@ -964,6 +968,12 @@ case $PROJECT in
elif [ "$variant" = "hwe" ]; then elif [ "$variant" = "hwe" ]; then
kernel_metapkg=linux-generic-hwe-$(lsb_release -sr) kernel_metapkg=linux-generic-hwe-$(lsb_release -sr)
flavor=generic-hwe 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 elif [ "$variant" = "intel" ]; then
kernel_metapkg=linux-intel-iotg kernel_metapkg=linux-intel-iotg
flavor=intel-iotg flavor=intel-iotg

4
live-build/ubuntu-server/hooks/03-kernel-metapkg.chroot_early
View File

@ -11,6 +11,10 @@ case $PASS in
kernel_metapkg=linux-generic kernel_metapkg=linux-generic
elif [ "$flavor" = "generic-hwe" ]; then elif [ "$flavor" = "generic-hwe" ]; then
kernel_metapkg=linux-generic-hwe-$(lsb_release -sr) 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 elif [ "$flavor" = "intel-iotg" ]; then
kernel_metapkg=linux-intel-iotg kernel_metapkg=linux-intel-iotg
elif [ "$flavor" = "nvidia-tegra" ]; then elif [ "$flavor" = "nvidia-tegra" ]; then