For ubuntu-server, consider the actual kernel flavor when dealing with netboot layers - even if we don't really care in the end.

This commit is contained in:
Łukasz 'sil2100' Zemczak 2024-01-30 11:29:50 +01:00
parent d58a31e130
commit 3a99b297d4
2 changed files with 11 additions and 4 deletions

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (24.04.25) UNRELEASED; urgency=medium
* live-build/auto/config: for ubuntu-server, consider the actual kernel
flavor when dealing with netboot layers - even if we don't really care.
-- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> Tue, 30 Jan 2024 11:27:46 +0100
livecd-rootfs (24.04.24) noble; urgency=medium
[ Tomáš Virtus ]

View File

@ -993,16 +993,16 @@ case $PROJECT in
done
case $ARCH in
amd64)
add_package ubuntu-server-minimal.ubuntu-server.installer.generic.netboot grub-pc shim-signed pxelinux
add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor.netboot grub-pc shim-signed pxelinux
;;
arm64)
add_package ubuntu-server-minimal.ubuntu-server.installer.generic.netboot shim-signed
add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor.netboot shim-signed
;;
*)
add_package ubuntu-server-minimal.ubuntu-server.installer.generic.netboot
add_package ubuntu-server-minimal.ubuntu-server.installer.$flavor.netboot
;;
esac
NO_SQUASHFS_PASSES=ubuntu-server-minimal.ubuntu-server.installer.generic.netboot
NO_SQUASHFS_PASSES=ubuntu-server-minimal.ubuntu-server.installer.$flavor.netboot
/usr/share/livecd-rootfs/checkout-translations-branch \
https://git.launchpad.net/subiquity po config/catalog-translations