From 8b6085bb674dfe734511281aedda0fbba32ebe3f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?=
 <lukasz.zemczak@canonical.com>
Date: Wed, 24 May 2023 15:31:04 +0200
Subject: [PATCH] Some initial work on getting Ubuntu Budgie building new
 installer images.

---
 live-build/auto/build  | 11 +++++++---
 live-build/auto/config | 48 +++++++++++++++++++++++++++++++++++++++---
 2 files changed, 53 insertions(+), 6 deletions(-)

diff --git a/live-build/auto/build b/live-build/auto/build
index 2568057e..df39063c 100755
--- a/live-build/auto/build
+++ b/live-build/auto/build
@@ -549,9 +549,14 @@ 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 [ "$PROJECT" = "ubuntu" ] && [ "$SUBPROJECT" != "legacy" ]; then
-	rm -f livecd.${PROJECT}-manifest-remove
-	rm -f config/manifest-minimal-remove
+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
 
 if [ -e config/manifest-minimal-remove ]; then
diff --git a/live-build/auto/config b/live-build/auto/config
index c9d1e793..0db6bd25 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -549,7 +549,7 @@ case $IMAGEFORMAT in
 				;;
 			ubuntu-wsl)
 				;;
-			ubuntu)
+			ubuntu|ubuntu-budgie)
 				if [ "$SUBPROJECT" = "legacy" ]; then
 					add_package live casper
 				fi
@@ -899,8 +899,50 @@ case $PROJECT in
 		;;
 
 	ubuntu-budgie)
-		add_task install minimal standard ubuntu-budgie-desktop
-		LIVE_TASK='ubuntu-budgie-live'
+		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.
+				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-language
+				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-desktop-installer/classic
+
+				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
 		;;
 
 	ubuntu-mate)