From abcfabdbc0e1936b55fd58a1d04f20293d90fc0d Mon Sep 17 00:00:00 2001
From: Steve Langasek <steve.langasek@canonical.com>
Date: Mon, 25 Jul 2022 12:50:56 -0700
Subject: [PATCH] Drop support for building i386 images aside from the
 launchpad builder images.

---
 debian/changelog       |  7 +++++++
 live-build/auto/build  | 20 --------------------
 live-build/auto/config | 10 ++++------
 3 files changed, 11 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5caed142..93baaa7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.771) UNRELEASED; urgency=medium
+
+  * Drop support for building i386 images aside from the launchpad builder
+    images.
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Mon, 25 Jul 2022 12:49:28 -0700
+
 livecd-rootfs (2.770) kinetic; urgency=medium
 
   [ Alexandre Ghiti ]
diff --git a/live-build/auto/build b/live-build/auto/build
index 7621de65..9a1fd8ff 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -641,26 +641,6 @@ case $SUBARCH in
 		;;
 esac
 
-# LTSP chroot building (only in 32bit and for Edubuntu (DVD))
-case $PROJECT in
-	edubuntu-dvd)
-		if [ "$ARCH" = i386 ]; then
-			echo "Building LTSP chroot"
-			ltsp-build-client --base $(pwd) --mirror $LB_PARENT_MIRROR_BOOTSTRAP --arch $ARCH --dist $LB_PARENT_DISTRIBUTION --chroot ltsp-live --late-packages ldm-edubuntu-theme,plymouth-theme-edubuntu --purge-chroot --skipimage
-			mkdir -p images
-			mksquashfs ltsp-live images/ltsp-live.img -e cdrom
-			rm -Rf ltsp-live
-			if [ -f images/ltsp-live.img ]; then
-				mv images/ltsp-live.img livecd.$PROJECT-ltsp.squashfs
-				chmod 0644 livecd.$PROJECT-ltsp.squashfs
-				rmdir --ignore-fail-on-non-empty images
-			else
-				echo "LTSP: Unable to build the chroot, see above for details."
-			fi
-		fi
-		;;
-esac
-
 if [ -f "config/magic-proxy.pid" ]; then
     kill -TERM $(cat config/magic-proxy.pid)
     rm -f config/magic-proxy.pid
diff --git a/live-build/auto/config b/live-build/auto/config
index 89650c59..fb7f9491 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -391,8 +391,6 @@ case $IMAGEFORMAT in
 				MODEL=intel-iot ;;
 			amd64+*)
 				MODEL=pc-amd64 ;;
-			i386+*)
-				MODEL=pc-i386 ;;
 			arm64+snapdragon)
 				MODEL=dragonboard ;;
 			armhf+raspi)
@@ -425,7 +423,7 @@ case $IMAGEFORMAT in
 
 			CHANNEL="${CHANNEL:-edge}"
 			case $MODEL in
-				pc-amd64|pc-i386)
+				pc-amd64)
 					if [ -z "${SUBARCH:-}" ]; then
 						# This is to make sure there's enough writable space
 						UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS --image-size 3700M"
@@ -776,7 +774,7 @@ case $PROJECT in
 		LIVE_TASK='xubuntu-live'
 		COMPONENTS='main restricted universe multiverse'
 		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=generic ;;
+			amd64)	KERNEL_FLAVOURS=generic ;;
 		esac
 		;;
 
@@ -796,7 +794,7 @@ case $PROJECT in
 		LIVE_TASK='lubuntu-live'
 		COMPONENTS='main restricted universe multiverse'
 		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=generic ;;
+			amd64)	KERNEL_FLAVOURS=generic ;;
 		esac
 		;;
 
@@ -822,7 +820,7 @@ case $PROJECT in
 		add_task install minimal standard ubuntustudio-desktop ubuntustudio-audio ubuntustudio-graphics ubuntustudio-video ubuntustudio-photography
 		COMPONENTS='main restricted universe multiverse'
 		case $ARCH in
-			amd64|i386)	KERNEL_FLAVOURS=lowlatency ;;
+			amd64)	KERNEL_FLAVOURS=lowlatency ;;
 		esac
 		;;