|
|
@ -352,6 +352,8 @@ case $IMAGEFORMAT in
|
|
|
|
ubuntu-image)
|
|
|
|
ubuntu-image)
|
|
|
|
UBUNTU_IMAGE_ARGS=""
|
|
|
|
UBUNTU_IMAGE_ARGS=""
|
|
|
|
case "$ARCH+${SUBARCH:-}" in
|
|
|
|
case "$ARCH+${SUBARCH:-}" in
|
|
|
|
|
|
|
|
intel-iot)
|
|
|
|
|
|
|
|
MODEL=intel-iot ;;
|
|
|
|
amd64+*)
|
|
|
|
amd64+*)
|
|
|
|
MODEL=pc-amd64 ;;
|
|
|
|
MODEL=pc-amd64 ;;
|
|
|
|
i386+*)
|
|
|
|
i386+*)
|
|
|
@ -466,6 +468,9 @@ case $IMAGEFORMAT in
|
|
|
|
pi-arm64|pi3-arm64)
|
|
|
|
pi-arm64|pi3-arm64)
|
|
|
|
MODEL=pi
|
|
|
|
MODEL=pi
|
|
|
|
;;
|
|
|
|
;;
|
|
|
|
|
|
|
|
intel-iot)
|
|
|
|
|
|
|
|
MODEL=pc
|
|
|
|
|
|
|
|
;;
|
|
|
|
esac
|
|
|
|
esac
|
|
|
|
|
|
|
|
|
|
|
|
BRANCH="classic"
|
|
|
|
BRANCH="classic"
|
|
|
@ -480,7 +485,7 @@ case $IMAGEFORMAT in
|
|
|
|
# We need to look in two places for the gadget tree:
|
|
|
|
# We need to look in two places for the gadget tree:
|
|
|
|
# - Launchpad hosted gadgets will be in the snap-gadget repo
|
|
|
|
# - Launchpad hosted gadgets will be in the snap-gadget repo
|
|
|
|
# - Github hosted gadgets are mirrored into a github-mirror 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-amd64 -b $BRANCH config/$PREFIX-gadget
|
|
|
|
|
|
|
|
|
|
|
|
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
|
|
|
|
echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
|
|
|
|
echo "SUITE=$SUITE" >> config/common
|
|
|
|
echo "SUITE=$SUITE" >> config/common
|
|
|
|