From 99d2064f3233fcef2dce71743e263706f4ac5ff1 Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Sun, 5 Nov 2023 15:58:23 +0200
Subject: [PATCH] Drop a few remaining 'legacy' references.

---
 debian/changelog                |  6 ++++++
 debian/tests/default-bootstraps |  1 -
 live-build/auto/build           | 16 +++++++---------
 live-build/auto/config          |  8 ++------
 4 files changed, 15 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 718859b1..1b69b002 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (24.04.4) UNRELEASED; urgency=medium
+
+  * Drop a few remaining 'legacy' references.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Sun, 05 Nov 2023 15:53:37 +0200
+
 livecd-rootfs (24.04.3) noble; urgency=medium
 
   * Drop the legacy images for both Ubuntu and Ubuntu Budgie.
diff --git a/debian/tests/default-bootstraps b/debian/tests/default-bootstraps
index dfe77ff3..5ce3fffe 100755
--- a/debian/tests/default-bootstraps
+++ b/debian/tests/default-bootstraps
@@ -18,7 +18,6 @@ ALL_TRIPLETS="
  lubuntu::
  ubuntu-unity::
  ubuntu::
- ubuntu:legacy:
  ubuntu-base::
  ubuntu-base:buildd:
  ubuntu-budgie::
diff --git a/live-build/auto/build b/live-build/auto/build
index 8c48a00e..787ac9ce 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -582,15 +582,13 @@ for OUTPUT in ext2 ext3 ext4 manifest manifest-remove size squashfs; do
 done
 
 # we don't need a manifest-remove for a layered-aware installer
-if [ "$SUBPROJECT" != "legacy" ]; then
-	# here we have a list of all new-installer flavors
-	case $PROJECT in
-		ubuntu|ubuntu-budgie)
-			rm -f livecd.${PROJECT}-manifest-remove
-			rm -f config/manifest-minimal-remove
-			;;
-	esac
-fi
+# here we have a list of all new-installer flavors
+case $PROJECT in
+	ubuntu|ubuntu-budgie)
+		rm -f livecd.${PROJECT}-manifest-remove
+		rm -f config/manifest-minimal-remove
+		;;
+esac
 
 if [ -e config/manifest-minimal-remove ]; then
         cp config/manifest-minimal-remove  "$PREFIX.manifest-minimal-remove"
diff --git a/live-build/auto/config b/live-build/auto/config
index a730224a..47eda25b 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -537,12 +537,8 @@ case $IMAGEFORMAT in
 		;;
 	*)
 		case $PROJECT in
-			ubuntu-server|ubuntu-wsl|ubuntu-oem)
-				;;
-			ubuntu|ubuntu-budgie)
-				if [ "$SUBPROJECT" = "legacy" ]; then
-					add_package live casper
-				fi
+			ubuntu-server|ubuntu-wsl|ubuntu-oem|ubuntu|\
+			ubuntu-budgie)
 				;;
 			*)
 				add_package live casper