Imported 2.621

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (2.621) focal; urgency=medium
+
+  * Make sure the imx6 subarch uses the ubuntu-image imageformat.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Tue, 29 Oct 2019 12:31:35 +0100
+
 livecd-rootfs (2.620) eoan; urgency=medium
 
   * Limit the lxd group to images with an installer; it's less appropriate

live-build/auto/config

@@ -279,12 +279,14 @@ _get_live_passes ()
 if [ -z "${IMAGEFORMAT:-}" ]; then
 	case $PROJECT:${SUBPROJECT:-} in
 		ubuntu-cpc:*|ubuntu:desktop-preinstalled)
-			if [ "$SUBARCH" = "raspi3" ]; then
+			case $SUBARCH in
-				# For now only raspi3, but others are soon to follow
+				raspi3|imx6)
 					IMAGEFORMAT=ubuntu-image
-			else
+					;;
+				*)
 					IMAGEFORMAT=ext4
-			fi
+					;;
+			esac
 			;;
 		ubuntu-server:live)
 			IMAGEFORMAT=plain