[Merge] livecd-rootfs:bdmurray/intel-iot-models into livecd-rootfs:ubuntu/master

[Brian Murray]

Not super required still seems worth doing!

Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index ca74676..800e7a9 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -480,7 +485,7 @@ 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
> -			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

That seems reasonable to me so I'll make that change.

>  
>  			echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
>  			echo "SUITE=$SUITE" >> config/common


-- 
https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+merge/405844
Your team Ubuntu Core Development Team is subscribed to branch livecd-rootfs:ubuntu/master.