[neon/neon/livecd-rootfs/Neon/release] live-build/auto: modify for new noble paradigms

[Carlos De Maine]

Git commit 21af9c1f10ce4e3838c4977c4b390155382db03a by Carlos De Maine.
Committed on 12/07/2024 at 11:54.
Pushed by carlosdem into branch 'Neon/release'.

modify for new noble paradigms

M  +5    -12   live-build/auto/config

https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/21af9c1f10ce4e3838c4977c4b390155382db03a

diff --git a/live-build/auto/config b/live-build/auto/config
index 06f46e43..70e19276 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -713,7 +713,7 @@ case $PROJECT in
                 FLAVOUR=kubuntu
                 ;;
         neon*)
-                SEED=neon
+                FLAVOUR=neon
                 ;;
         xubuntu*)
                 FLAVOUR=xubuntu
@@ -751,7 +751,7 @@ case $PROJECT in
 	edubuntu|ubuntu-budgie|ubuntucinnamon|ubuntukylin)
 		COMPONENTS='main restricted universe'
 		;;
-	lubuntu|kubuntu|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|xubuntu)
+	lubuntu|kubuntu|neon|ubuntu-mate|ubuntu-unity|ubuntustudio-dvd|xubuntu)
 		COMPONENTS='main restricted universe multiverse'
 		;;
 esac
@@ -976,15 +976,8 @@ case $PROJECT in
 		HWE=""
 		KERNEL_FLAVOURS="generic${HWE:+-$HWE_SUFFIX}"
 		add_task install minimal standard
-		# Make sure we also have the HWE xwayland or things are gonna explode.
-		# Regular HWE code kinda ignores this because Ubuntu doesn't really
-		# support wayland.
-		add_package install "xwayland${HWE:+-$HWE_SUFFIX}"
-		case $ARCH in
-			amd64)	add_package live linux-$KERNEL_FLAVOURS neon-live;;
-		esac
+		add_package live linux-$KERNEL_FLAVOURS neon-live
 		add_package neon-desktop neon-live
-		COMPONENTS='main restricted universe'
 		;;
 
 	ubuntu-core-desktop)
@@ -1343,7 +1336,7 @@ fi
 # grab a list of packags to remove for a "minimal" installation from the seed
 # mirror for this project
 case $PROJECT in
-	kubuntu|ubuntu-mate|ubuntu-unity|ubuntukylin)
+	kubuntu|neon|ubuntu-mate|ubuntu-unity|ubuntukylin)
 		# only used now for the 'minimal-remove' functionality,
 		# which is not used at all in layered images
 		BASE_SEED='desktop'
@@ -1766,4 +1759,4 @@ cd /var/lib/preinstalled-pool/pool/
 apt-get -y download $PREINSTALL_POOL
 EOF
 	fi
-fi
\ No newline at end of file
+fi