From e4c846199b1496d357ed25c43fdc4fbad2ebc3c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 22 Feb 2022 11:33:26 +0100 Subject: [PATCH 1/2] Following Dave's changes to the classic pi gadget, switch to using the classic branch for desktop images as well. --- live-build/auto/build | 3 ++- live-build/auto/config | 6 ++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/live-build/auto/build b/live-build/auto/build index 0cb9cf54..8fdd359f 100755 --- a/live-build/auto/build +++ b/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 diff --git a/live-build/auto/config b/live-build/auto/config index 2e4ad395..477ae96e 100755 --- a/live-build/auto/config +++ b/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" From 0a7892b7c7db95b8cdd59e5b335efabacfb9e09a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Tue, 22 Feb 2022 11:35:18 +0100 Subject: [PATCH 2/2] Add changelog. --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 47813586..3e6c1c00 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (2.757) UNRELEASED; urgency=medium + + * 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 Tue, 22 Feb 2022 11:33:28 +0100 + livecd-rootfs (2.756) jammy; urgency=medium * Unset `initrdless_boot_fallback_triggered` in /boot/grub/grubenv instead