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

[Steve Langasek]

Review: Needs Fixing



Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index 98802ae..fc81b9b 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -348,7 +348,6 @@ fi
>  # one also must request disk1-img-xz image format
>  if [ "$IMAGEFORMAT" = "ext4" ] && [ "$PROJECT" = "ubuntu-cpc" ]; then
>  	case $ARCH:$SUBARCH in
> -		armhf:raspi2 | \

Per se correct removal of unused code, but of concern here is why we ARE hard-coding ubuntu:ubuntu default user on riscv64 images when we don't need to do so on raspi images.  Will take that up in a separate bug report.

>  		riscv64:icicle | \
>  		riscv64:nezha | \
>  		riscv64:licheerv | \
> @@ -398,18 +397,8 @@ case $IMAGEFORMAT in
>  				MODEL=pc-amd64 ;;
>  			arm64+snapdragon)
>  				MODEL=dragonboard ;;
> -			armhf+raspi)
> +			*+raspi)
>  				MODEL=pi ;;
> -			armhf+raspi2)
> -				MODEL=pi2 ;;
> -			armhf+raspi3)
> -				MODEL=pi3 ;;
> -			arm64+raspi)
> -				MODEL=pi-arm64 ;;

This changes the behavior if IMAGEFORMAT==ubuntu-image but PROJECT!=ubuntu-core for arm64+raspi; previously this would result in MODEL being set to pi-arm64 and now it will be set to pi.  And we do use this for classing images where PROJECT!=ubuntu-core, so this results in the wrong behavior, I think, because this needs to match ubuntu-server-pi-arm64.yaml in git://git.launchpad.net/ubuntu-images.

And it doesn't matter for the armhf case because we *happen* to have ubuntu-server-pi-armhf.yaml as a symlink to ubuntu-server-pi.yaml in that repo!

So I think we want to clean this up further by directly setting MODEL=pi-${ARCH} for both the classic and core cases, and deleting the core-specific handling below.

> -			arm64+raspi3)
> -				MODEL=pi3-arm64 ;;
> -			armhf+cm3)
> -				MODEL=cm3 ;;
>  			arm64+tegra)
>  				MODEL=tegra ;;
>  			arm64+tegra-igx)


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