Imported 2.730

No reason for CPC update specified.

debian/changelog

@@ -1,3 +1,10 @@
+livecd-rootfs (2.730) impish; urgency=medium
+
+  * Rename subarch of intel-iotg to intel-iot, add support for intel-iot
+    models.
+
+ -- Brian Murray <brian@ubuntu.com>  Mon, 26 Jul 2021 11:55:42 -0700
+
 livecd-rootfs (2.729) impish; urgency=medium
 
   [ Michael Hudson-Doyle ]

live-build/auto/config

@@ -299,7 +299,7 @@ if [ -z "${IMAGEFORMAT:-}" ]; then
 	case $PROJECT:${SUBPROJECT:-} in
 		ubuntu-cpc:*|ubuntu:desktop-preinstalled)
 			case $SUBARCH in
-				raspi|intel-iotg)
+				raspi|intel-iot)
 					IMAGEFORMAT=ubuntu-image
 					;;
 				*)
@@ -352,6 +352,8 @@ case $IMAGEFORMAT in
 	ubuntu-image)
 		UBUNTU_IMAGE_ARGS=""
 		case "$ARCH+${SUBARCH:-}" in
+			intel-iot)
+				MODEL=intel-iot ;;
 			amd64+*)
 				MODEL=pc-amd64 ;;
 			i386+*)
@@ -466,6 +468,9 @@ case $IMAGEFORMAT in
 				pi-arm64|pi3-arm64)
 					MODEL=pi
 					;;
+				intel-iot)
+					MODEL=pc
+					;;
 			esac
 
 			BRANCH="classic"
@@ -480,7 +485,7 @@ case $IMAGEFORMAT in
 			# We need to look in two places for the gadget tree:
 			# - Launchpad hosted gadgets will be in the snap-gadget repo
 			# - Github hosted gadgets are mirrored into a github-mirror repo
-			git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/snap-$MODEL -b $BRANCH config/$PREFIX-gadget || git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror -b $BRANCH config/$PREFIX-gadget
+			git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/snap-$MODEL -b $BRANCH config/$PREFIX-gadget || git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror -b $BRANCH config/$PREFIX-gadget || git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror-$ARCH -b $BRANCH config/$PREFIX-gadget
 
 			echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
 			echo "SUITE=$SUITE" >> config/common
@@ -644,7 +649,7 @@ case $PROJECT in
 						OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
 						OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
 						;;
-					intel-iotg)
+					intel-iot)
 						KERNEL_FLAVOURS='image-intel'
 						COMPONENTS='main restricted universe'
 						OPTS="${OPTS:+$OPTS }--initramfs=none"
@@ -854,7 +859,7 @@ case $PROJECT in
 			amd64)
 				if [ "${SUBARCH:-}" = "generic" ]; then
 					KERNEL_FLAVOURS=generic
-				elif [ "${SUBARCH:-}" = "intel-iotg" ]; then
+				elif [ "${SUBARCH:-}" = "intel-iot" ]; then
 					KERNEL_FLAVOURS=image-intel
 					COMPONENTS='main restricted universe'
 					OPTS="${OPTS:+$OPTS }--initramfs=none"
@@ -1014,7 +1019,7 @@ case $PROJECT in
 	amd64)
 		KERNEL_FLAVOURS="${SUBARCH:-$KERNEL_FLAVOURS}"
 		case $SUBARCH in
-			intel-iotg)
+			intel-iot)
 				COMPONENTS='main restricted universe'
 				KERNEL_FLAVOURS='image-intel'
 		esac