From 8c997e98921329242f876623d9b55ca561f17c93 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Mon, 4 Nov 2019 07:18:08 +0000 Subject: [PATCH] Imported 2.622 No reason for CPC update specified. --- debian/changelog | 7 +++++++ live-build/auto/config | 5 ++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dcd36fb8..53917d86 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.622) focal; urgency=medium + + * Support fetching classic gadget trees from a non-github-mirrored launchpad + repository for ubuntu-image to use. + + -- Łukasz 'sil2100' Zemczak Wed, 30 Oct 2019 14:06:48 +0100 + livecd-rootfs (2.621) focal; urgency=medium * Make sure the imx6 subarch uses the ubuntu-image imageformat. diff --git a/live-build/auto/config b/live-build/auto/config index dcc63896..e2b8d5c0 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -389,7 +389,10 @@ case $IMAGEFORMAT in UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${PROPOSED:+ --with-proposed}" UBUNTU_IMAGE_ARGS="$UBUNTU_IMAGE_ARGS${EXTRA_PPAS:+ --extra-ppas \"$EXTRA_PPAS\"}" - git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror -b classic config/$PREFIX-gadget + # 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 classic config/$PREFIX-gadget || git clone git://git.launchpad.net/~canonical-foundations/snap-$MODEL/+git/github-mirror -b classic config/$PREFIX-gadget echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common echo "SUITE=$SUITE" >> config/common