[Merge] ~waveform/livecd-rootfs:pi-tidy-2 into livecd-rootfs:ubuntu/master

[Steve Langasek]

Review: Needs Fixing

> Also, specify KERNEL_FLAVOURS in a similar location to other subarchs.

However, this is specifying it for desktop and server preinstalled, and this change would leave it unset for other projects (or require duplicating this setting elsewhere).  Hasn't there been engagement about the possibility of adding official raspi images for other community flavors?

It also strikes me as odd that we are setting BINARY_REMOVE_LINUX=false here for the raspi desktop-preinstalled images, but NOT for the intel-iotg desktop-preinstalled images.  Surely, this setting should actually be a function of the image type and not a function of the subarch.

Further digging shows that:
- we only ever built intel-iot preinstalled images for focal
- we stopped building them in Nov 2021, switching to building daily-live images instead
- we never released a preinstalled intel-iot image

So I recommend moving the BINARY_REMOVE_LINUX setting outside the subarch block, and then separately we should drop the dead intel-iot code.

Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index 98802ae..38b04d4 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -1011,6 +1013,7 @@ case $PROJECT in
>  		OPTS="${OPTS:+$OPTS }--initramfs=none"
>  		case "$ARCH+${SUBARCH:-}" in
>  			*+raspi)
> +				KERNEL_FLAVOURS=raspi

not shown in context is that BINARY_REMOVE_LINUX=false is set for all server images just above, so doesn't have to be set here for raspi-only.

>  				add_task install ubuntu-server-raspi
>  				;;
>  			armhf*)


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