Imported 2.898

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,19 @@
+livecd-rootfs (2.898) mantic; urgency=medium
+
+  * Remove the catalog entry for the Ubuntu desktop minimal installation,
+    we are removing the option from the desktop installer and making the
+    content of the default installation closer from minimal instead.
+
+ -- Sebastien Bacher <seb128@ubuntu.com>  Fri, 07 Jul 2023 07:39:38 +0200
+
+livecd-rootfs (2.897) mantic; urgency=medium
+
+  [ Heinrich Schuchardt ]
+  * RISC-V: handle kernel flavour allwinner. Package linux-allwinner has a
+    kernel with the generic flavour as dependency.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Wed, 05 Jul 2023 17:57:11 +0200
+
 livecd-rootfs (2.896) mantic; urgency=medium
 
   * live-build/ubuntu/hooks/033-disk-image-uefi.binary: update to point at

live-build/auto/build

@@ -614,7 +614,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
 		continue
 	fi
 	case $FLAVOUR in
-		virtual|generic-hwe-*)
+		allwinner|virtual|generic-hwe-*)
 			FLAVOUR="generic"
 			;;
 		oem-*)

live-build/auto/config

@@ -794,19 +794,10 @@ case $PROJECT in
 				echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages
 				derive_language_layers minimal desktop-minimal desktop-minimal-default-languages "$seeded_langs"
 				derive_language_layers minimal.standard desktop desktop-default-languages "$seeded_langs"
-				cat <<-EOF > config/minimal.catalog-in.yaml
-					name: "Ubuntu Desktop (minimized)"
-					description: >-
-					  A minimal but usable Ubuntu Desktop.
-					id: ubuntu-desktop-minimal
-					type: fsimage-layered
-					variant: desktop
-					locale_support: langpack
-				EOF
 				cat <<-EOF > config/minimal.standard.catalog-in.yaml
 					name: "Ubuntu Desktop"
 					description: >-
-					  A full featured Ubuntu Desktop.
+					  Ubuntu Desktop.
 					id: ubuntu-desktop
 					type: fsimage-layered
 					variant: desktop
@@ -1131,6 +1122,9 @@ case $PROJECT in
 			riscv64*)
 				if [ -n "$SUBARCH" ]; then
 					case "${SUBARCH:-}" in
+						nezha|licheerv)
+							KERNEL_FLAVOURS=allwinner
+							;;
 						visionfive)
 							KERNEL_FLAVOURS=starfive
 							;;