[neon/neon/livecd-rootfs/Neon/release] /: For raspi preinstalled builds, use a per-series dedicated gadget branch.

[Łukasz 'sil2100' Zemczak]

Git commit 33362993d1f92d2069b0fc6df109ddee76e21e7a by Łukasz 'sil2100' Zemczak.
Committed on 15/01/2024 at 11:39.
Pushed by carlosdem into branch 'Neon/release'.

For raspi preinstalled builds, use a per-series dedicated gadget branch.

M  +7    -0    debian/changelog
M  +3    -2    live-build/auto/config

https://invent.kde.org/neon/neon/livecd-rootfs/-/commit/33362993d1f92d2069b0fc6df109ddee76e21e7a

diff --git a/debian/changelog b/debian/changelog
index 6015bcb4..76b8654c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+livecd-rootfs (2.765.34) UNRELEASED; urgency=medium
+
+  * For raspi preinstalled builds, use a per-series dedicated gadget branch.
+    (LP: #2049373)
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak at ubuntu.com>  Mon, 15 Jan 2024 11:32:47 +0100
+
 livecd-rootfs (2.765.33) jammy; urgency=medium
 
   [ Steve Langasek ]
diff --git a/live-build/auto/config b/live-build/auto/config
index 1750fa04..8ef56701 100755
--- a/live-build/auto/config
+++ b/live-build/auto/config
@@ -494,9 +494,11 @@ case $IMAGEFORMAT in
 			# classic images
 
 			# Certain models have different names but are built from the same source gadget tree
+			BRANCH="classic"
 			case $MODEL in
-				pi-arm64|pi3-arm64)
+				pi|pi-arm64|pi3-arm64)
 					MODEL=pi
+					BRANCH="classic-22.04"
 					;;
 				intel-iot)
 					MODEL=pc
@@ -515,7 +517,6 @@ 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