From 5634c7e769b37124376eaf888e5ba6005a368433 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Sat, 4 Nov 2023 21:56:23 +0200
Subject: [PATCH] Drop the legacy images for both Ubuntu and Ubuntu Budgie.

---
 debian/changelog       |  6 +++
 live-build/auto/config | 92 +++++++++++++++++-------------------------
 2 files changed, 42 insertions(+), 56 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c5126412..85bc9c33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (24.04.3) UNRELEASED; urgency=medium
+
+  * Drop the legacy images for both Ubuntu and Ubuntu Budgie.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sat, 04 Nov 2023 21:55:34 +0200
+
 livecd-rootfs (24.04.2) noble; urgency=medium
 
   * Enable snap preseeding with ppc64el images where /boot/vmlinux is used
diff --git a/live-build/auto/config b/live-build/auto/config
index 28983125..3d271280 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -675,17 +675,7 @@ fi
 
 case $PROJECT in
 	ubuntu)
-
 		case ${SUBPROJECT:-} in
-			legacy)
-				LIVE_TASK='ubuntu-live'
-				add_task install minimal standard ubuntu-desktop
-				add_task live ubuntu-desktop-minimal-default-languages ubuntu-desktop-default-languages
-				KERNEL_FLAVOURS='generic-hwe-22.04'
-				if [ "$SUBARCH" = "intel-iot" ]; then
-					KERNEL_FLAVOURS='intel-iotg'
-				fi
-				;;
 			desktop-preinstalled)
 				add_task install minimal standard ubuntu-desktop
 				case $SUBARCH in
@@ -857,52 +847,42 @@ case $PROJECT in
 		;;
 
 	ubuntu-budgie)
-		case ${SUBPROJECT:-} in
-			legacy)
-				add_task install minimal standard ubuntu-budgie-desktop
-				LIVE_TASK='ubuntu-budgie-live'
-				;;
-
-			*)
-				# By default Ubuntu Budgie now ships the new installer.
-				touch config/universe-enabled
-				PASSES_TO_LAYERS="true"
-				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
-				add_package minimal cloud-init
-				remove_package minimal.standard.live ubiquity-frontend-gtk
-				add_snap minimal.standard.live ubuntu-budgie-installer/classic
-				add_package minimal.standard.live linux-$KERNEL_FLAVOURS casper
-
-				seeded_langs="$(get_seeded_languages budgie-desktop-minimal budgie-desktop)"
-				echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages
-				derive_language_layers minimal budgie-desktop-minimal budgie-desktop-minimal-default-languages "$seeded_langs"
-				derive_language_layers minimal.standard budgie-desktop budgie-desktop-default-languages "$seeded_langs"
-				cat <<-EOF > config/minimal.catalog-in.yaml
-					name: "Ubuntu Budgie Desktop (minimized)"
-					description: >-
-					  A minimal but usable Ubuntu Budgie Desktop.
-					id: ubuntu-budgie-desktop-minimal
-					type: fsimage-layered
-					variant: desktop
-					locale_support: langpack
-				EOF
-				cat <<-EOF > config/minimal.standard.catalog-in.yaml
-					name: "Ubuntu Budgie Desktop"
-					description: >-
-					  A full featured Ubuntu Budgie Desktop.
-					id: ubuntu-budgie-desktop
-					type: fsimage-layered
-					variant: desktop
-					locale_support: langpack
-					default: yes
-				EOF
-				/usr/share/livecd-rootfs/checkout-translations-branch \
-					https://git.launchpad.net/subiquity po config/catalog-translations
-				;;
-		esac
+		# By default Ubuntu Budgie now ships the new installer.
+		touch config/universe-enabled
+		PASSES_TO_LAYERS="true"
+		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
+		add_package minimal cloud-init
+		remove_package minimal.standard.live ubiquity-frontend-gtk
+		add_snap minimal.standard.live ubuntu-budgie-installer/classic
+		add_package minimal.standard.live linux-$KERNEL_FLAVOURS casper
+		seeded_langs="$(get_seeded_languages budgie-desktop-minimal budgie-desktop)"
+		echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages
+		derive_language_layers minimal budgie-desktop-minimal budgie-desktop-minimal-default-languages "$seeded_langs"
+		derive_language_layers minimal.standard budgie-desktop budgie-desktop-default-languages "$seeded_langs"
+		cat <<-EOF > config/minimal.catalog-in.yaml
+			name: "Ubuntu Budgie Desktop (minimized)"
+			description: >-
+			  A minimal but usable Ubuntu Budgie Desktop.
+			id: ubuntu-budgie-desktop-minimal
+			type: fsimage-layered
+			variant: desktop
+			locale_support: langpack
+		EOF
+		cat <<-EOF > config/minimal.standard.catalog-in.yaml
+			name: "Ubuntu Budgie Desktop"
+			description: >-
+			  A full featured Ubuntu Budgie Desktop.
+			id: ubuntu-budgie-desktop
+			type: fsimage-layered
+			variant: desktop
+			locale_support: langpack
+			default: yes
+		EOF
+		/usr/share/livecd-rootfs/checkout-translations-branch \
+			https://git.launchpad.net/subiquity po config/catalog-translations
 		;;
 
 	ubuntu-mate)