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

[Michael Hudson-Doyle]

Mostly fine, just a couple of comments.

Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index 86e506e..9ebe3ba 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -444,7 +449,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-$ARCH -b $BRANCH config/$PREFIX-gadget

This is making my eyes bleed so much I can't be sure but the "|| ||" in here can't be right?

>  
>  			echo "IMAGEFORMAT=$IMAGEFORMAT" >> config/common
>  			echo "SUITE=$SUITE" >> config/common
> @@ -590,6 +595,19 @@ case $PROJECT in
>  				remove_packages_from_seed_regexp minimal.standard desktop-default-languages '^desktop-(?!default-languages|minimal|common)[^.]+$'
>  				remove_packages_from_seed_regexp minimal.standard desktop-default-languages ''  # none (if no default langpack is selected)
>  				;;
> +
> +			desktop-preinstalled)

This changes the behaviour in the case of intel-iot desktop-presinstalled builds -- LIVE_TASK isn't defined and tasks aren't added to the live task. It probably doesn't make any real difference (why would a desktop-preinstalled image need a live task?) but I can't see any fundamental reason why it won't happen. So putting this as a if [ "$PROJECT" = "desktop-presintalled" ] && [ "$SUBARCH" = "intel-iot" ]; then bock in the "*)" case would be more obviously harmless.

> +				add_task install minimal standard ubuntu-desktop
> +				if [ "$SUBARCH" = "intel-iot" ]; then
> +				    	KERNEL_FLAVOURS='image-intel'
> +					COMPONENTS='main restricted universe'
> +					OPTS="${OPTS:+$OPTS }--initramfs=none"
> +					OPTS="${OPTS:+$OPTS }--system=normal"
> +					OPTS="${OPTS:+$OPTS }--hdd-label=cloudimg-rootfs"
> +					OPTS="${OPTS:+$OPTS }--ext-resize-blocks=536870912 --ext-block-size=4096"
> +					OPTS="${OPTS:+$OPTS }--ext-fudge-factor=15"
> +				fi
> +				;;
>  			*)
>  				LIVE_TASK='ubuntu-live'
>  				add_task install minimal standard ubuntu-desktop


-- 
https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+merge/406328
Your team Ubuntu Core Development Team is requested to review the proposed merge of livecd-rootfs:bdmurray/focal-intel-iot into livecd-rootfs:ubuntu/focal.