From 9fdf33310e0d2f3164195c80d09e7517291b6096 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Fri, 4 Aug 2023 11:51:08 +0000 Subject: [PATCH] Imported 23.10.10 No reason for CPC update specified. --- debian/changelog | 7 +++++++ live-build/auto/config | 8 ++------ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index ccadf03a..38845894 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (23.10.10) mantic; urgency=medium + + * Revert "desktop, budgie: no need to include the kernel directly, it is + installed at runtime" due to build breakage + + -- Dan Bungert Thu, 03 Aug 2023 21:37:46 -0600 + livecd-rootfs (23.10.9) mantic; urgency=medium * desktop, budgie: no need to include the kernel directly, it is installed diff --git a/live-build/auto/config b/live-build/auto/config index e440c459..b5c722a4 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -784,9 +784,7 @@ case $PROJECT in *) touch config/universe-enabled PASSES_TO_LAYERS="true" - OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" - KERNEL_FLAVOURS=none - BINARY_REMOVE_LINUX=false + KERNEL_FLAVOURS='generic-hwe-22.04' add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages add_task minimal.standard.live ubuntu-live @@ -923,9 +921,7 @@ case $PROJECT in *) # By default Ubuntu Budgie now ships the new installer. PASSES_TO_LAYERS="true" - OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" - KERNEL_FLAVOURS=none - BINARY_REMOVE_LINUX=false + KERNEL_FLAVOURS='generic-hwe-22.04' add_task minimal minimal standard ubuntu-budgie-desktop-minimal ubuntu-budgie-desktop-minimal-default-languages add_task minimal.standard ubuntu-budgie-desktop ubuntu-budgie-desktop-default-languages add_task minimal.standard.live ubuntu-budgie-live