Imported 2.742

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,13 @@
+livecd-rootfs (2.742) impish; urgency=medium
+
+  [ Brian Murray ]
+  * Properly check ARCH when setting the intel-iot model.
+
+  [ Sebastien Bacher ]
+  * Enable universe sources on the desktop canary image.  LP: #1945831
+
+ -- Steve Langasek <steve.langasek@ubuntu.com>  Tue, 05 Oct 2021 13:11:33 -0700
+
 livecd-rootfs (2.741) impish; urgency=medium
 
   [ John Chittum ]

live-build/auto/config

@@ -654,6 +654,7 @@ case $PROJECT in
 
 		case ${SUBPROJECT:-} in
 			canary)
+				touch config/universe-enabled
 				PASSES_TO_LAYERS="true"
 				KERNEL_FLAVOURS='generic-hwe-20.04'
 				add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages
@@ -917,7 +918,7 @@ case $PROJECT in
 					KERNEL_FLAVOURS=generic
 				fi
 				;;
-			amd64)
+			amd64*)
 				if [ "${SUBARCH:-}" = "generic" ]; then
 					KERNEL_FLAVOURS=generic
 				elif [ "${SUBARCH:-}" = "intel-iot" ]; then