xubuntu-dev team mailing list archive

[Sean Davis <mp+460722@xxxxxxxxxxxxxxxxxx>]

Sean Davis has proposed merging ~xubuntu-dev/livecd-rootfs:xubuntu-new-installer into livecd-rootfs:ubuntu/master.

Commit message:
Change Xubuntu and Xubuntu Minimal to layered images

Requested reviews:
  Canonical Foundations Team (canonical-foundations)

For more details, see:
https://code.launchpad.net/~xubuntu-dev/livecd-rootfs/+git/livecd-rootfs/+merge/460722

Xubuntu now uses the new installer. This allows Xubuntu to keep our minimal install options and allows the installer to function correctly.

See https://code.launchpad.net/~ubuntucinnamon-dev/livecd-rootfs/+git/livecd-rootfs/+merge/460605 as the reference used for this MR.
-- 
Your team Xubuntu Developers is subscribed to branch ~xubuntu-dev/livecd-rootfs:xubuntu-new-installer.

diff --git a/debian/changelog b/debian/changelog
index ef3b50f..579a7e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+livecd-rootfs (24.04.36) noble; urgency=medium
+
+  * live-build/buildd/hooks/00-mirror.binary: Patch all sources files
+
+ -- Julian Andres Klode <juliank@xxxxxxxxxx>  Fri, 16 Feb 2024 22:04:07 +0100
+
 livecd-rootfs (24.04.35) noble; urgency=medium
 
   [ Steve Langasek ]
diff --git a/live-build/auto/config b/live-build/auto/config
index 1f8e950..1ad9ffe 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -569,7 +569,7 @@ case $IMAGEFORMAT in
 	*)
 		case $PROJECT in
 			ubuntu-server|ubuntu-wsl|ubuntu-oem|ubuntu|\
-			ubuntu-budgie|ubuntustudio-dvd|edubuntu|ubuntucinnamon)
+			ubuntu-budgie|ubuntustudio-dvd|edubuntu|ubuntucinnamon|xubuntu)
 				;;
 			*)
 				add_package live casper
@@ -880,15 +880,53 @@ case $PROJECT in
 		;;
 
 	xubuntu)
+		# Xubuntu now ships the new installer.
+		touch config/universe-enabled
+		PASSES_TO_LAYERS="true"
+		KERNEL_FLAVOURS=generic
 		case ${SUBPROJECT:-} in
 			minimal)
-				add_task install minimal standard xubuntu-minimal
+				add_task minimal minimal standard xubuntu-minimal
+				add_task minimal.standard xubuntu-minimal
+				cat <<-EOF > config/minimal.standard.catalog-in.yaml
+					name: "Xubuntu Minimal"
+					description: >-
+					A minimal installation of the Xubuntu Desktop.
+					id: xubuntu-minimal
+					type: fsimage-layered
+					variant: desktop
+					locale_support: langpack
+					default: yes
+				EOF
 				;;
 			*)
-				add_task install minimal standard xubuntu-desktop
+				add_task minimal minimal standard xubuntu-desktop
+				add_task minimal.standard xubuntu-desktop
+				cat <<-EOF > config/minimal.catalog-in.yaml
+					name: "Xubuntu Desktop (minimized)"
+					description: >-
+					A minimal installation of the Xubuntu Desktop.
+					id: xubuntu-desktop-minimal
+					type: fsimage-layered
+					variant: desktop
+					locale_support: langpack
+				EOF
+				cat <<-EOF > config/minimal.standard.catalog-in.yaml
+					name: "Xubuntu Desktop"
+					description: >-
+					A full featured Xubuntu Desktop.
+					id: xubuntu-desktop
+					type: fsimage-layered
+					variant: desktop
+					locale_support: langpack
+					default: yes
+				EOF
 				;;
 		esac
-		LIVE_TASK='xubuntu-live'
+		add_task minimal.standard.live xubuntu-live
+		add_package minimal.standard.live linux-$KERNEL_FLAVOURS
+		/usr/share/livecd-rootfs/checkout-translations-branch \
+			https://git.launchpad.net/subiquity po config/catalog-translations
 		;;
 
 	ubuntu-budgie)
@@ -1463,7 +1501,7 @@ esac
 case $PROJECT:${SUBPROJECT:-} in
 	ubuntu-cpc:*|ubuntu-server:live|ubuntu:desktop-preinstalled| \
 		ubuntu-wsl:*|ubuntu-mini-iso:*|ubuntu:|ubuntu-oem:*| \
-		ubuntustudio-dvd:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*)
+		ubuntustudio-dvd:*|edubuntu:*|ubuntu-budgie:*|ubuntucinnamon:*|xubuntu:*)
 		# Ensure that most things e.g. includes.chroot are copied as is
 		for entry in /usr/share/livecd-rootfs/live-build/${PROJECT}/*; do
 			case $entry in
diff --git a/live-build/buildd/hooks/00-mirror.binary b/live-build/buildd/hooks/00-mirror.binary
index a6722e0..202563d 100755
--- a/live-build/buildd/hooks/00-mirror.binary
+++ b/live-build/buildd/hooks/00-mirror.binary
@@ -9,4 +9,4 @@ set -e
 # /var/lib/apt/lists/ has suitable cached Packages files; this speeds up
 # builds on buildds.
 sed -i "s,${LB_PARENT_MIRROR_BINARY},${LB_MIRROR_BINARY},g" \
-	chroot/etc/apt/sources.list
+    $(find chroot/etc/apt/ -name '*.list' -o -name '*.sources')
diff --git a/live-build/xubuntu/hooks/020-ubuntu-live.chroot_early b/live-build/xubuntu/hooks/020-ubuntu-live.chroot_early
new file mode 120000
index 0000000..b410dda
--- /dev/null
+++ b/live-build/xubuntu/hooks/020-ubuntu-live.chroot_early
@@ -0,0 +1 @@
+../../ubuntu/hooks/020-ubuntu-live.chroot_early
\ No newline at end of file