Merge branch 'pi-desktop-one-gadget' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master

debian/changelog

@@ -1,10 +1,16 @@
 livecd-rootfs (2.757) UNRELEASED; urgency=medium
 
+  [ Dave Jones ]
   * Fix holes in swapfiles on pre-installed desktop images. Instead of
     pre-allocating the swapfile in the image, allocate it on first boot and
     use a systemd .swap unit to activate it (LP: #1961047)
 
- -- Dave Jones <dave.jones@canonical.com>  Tue, 22 Feb 2022 00:45:03 +0000
+  [ Łukasz 'sil2100' Zemczak ]
+  * Use the 'classic' branch of the pi gadget for both classic and desktop
+    pi images by specifying the gadget make target during the gadget priming
+    phase.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Tue, 22 Feb 2022 11:33:28 +0100
 
 livecd-rootfs (2.756) jammy; urgency=medium
 

live-build/auto/build

@@ -101,7 +101,8 @@ if [ "${IMAGEFORMAT:-}" = "ubuntu-image" ]; then
 		mv output/seed.manifest "$PREFIX".manifest
 	else
 		# First we need to build the gadget tree
-		make -C "config/$PREFIX-gadget" ARCH=$ARCH SERIES=$SUITE
+		make -C "config/$PREFIX-gadget" \
+			ARCH=$ARCH SERIES=$SUITE $GADGET_TARGET
 		ubuntu-image classic $UBUNTU_IMAGE_ARGS \
 			-s $SUITE -p $PROJECT -a $ARCH --subarch $SUBARCH \
 			-O output config/$PREFIX-gadget/install

live-build/auto/config

@@ -507,9 +507,9 @@ case $IMAGEFORMAT in
 					;;
 			esac
 
-			BRANCH="classic"
+			GADGET_TARGET="server"
 			if [ "$SUBPROJECT" = "desktop-preinstalled" ]; then
-				BRANCH="desktop"
+				GADGET_TARGET="desktop"
 			fi
 
 			UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${SUBPROJECT:+ --subproject \"$SUBPROJECT\"}"
@@ -519,10 +519,12 @@ 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
+			BRANCH="classic"
 			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
+			echo "GADGET_TARGET=$GADGET_TARGET" >> config/common
 			echo "UBUNTU_IMAGE_ARGS=\"$UBUNTU_IMAGE_ARGS\"" >> config/common
 
 			echo "Configured ubuntu-image for the following gadget model: $MODEL"