[Merge] livecd-rootfs:canary-as-default into livecd-rootfs:ubuntu/master

[Steve Langasek]

Review: Needs Information



Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index 13eb7b4..374387b 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -765,32 +765,6 @@ case $PROJECT in
>  				/usr/share/livecd-rootfs/checkout-translations-branch \
>  					https://git.launchpad.net/subiquity po config/catalog-translations
>  				;;
> -			*)
> -				touch config/universe-enabled
> -				PASSES_TO_LAYERS="true"
> -				KERNEL_FLAVOURS='generic-hwe-22.04'
> -				add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
> -				add_task standard.live ubuntu-live
> -				add_package standard cloud-init
> -				remove_package standard.live ubiquity-frontend-gtk
> -				add_snap standard.live ubuntu-desktop-installer/classic
> -
> -				seeded_langs="$(get_seeded_languages desktop)"
> -				echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages
> -				derive_language_layers standard desktop desktop-default-languages "$seeded_langs"
> -				cat <<-EOF > config/standard.catalog-in.yaml
> -					name: "Ubuntu Desktop"
> -					description: >-
> -					  Ubuntu Desktop.

NB the current description on the non-canary image is 'A full featured Ubuntu Desktop.' We probably want to retain this?

> -					id: ubuntu-desktop
> -					type: fsimage-layered
> -					variant: desktop
> -					locale_support: langpack
> -					default: yes
> -				EOF
> -				/usr/share/livecd-rootfs/checkout-translations-branch \
> -					https://git.launchpad.net/subiquity po config/catalog-translations
> -				;;
>  		esac
>  		;;
>  
> diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary
> index 781419c..2235f65 100755
> --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary
> +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary
> @@ -10,8 +10,8 @@ case $ARCH in
>  esac
>  
>  case ${PROJECT:-}:${SUBPROJECT:-} in
> -    *:canary)
> -        echo "We don't create EFI images for canary."
> +    ubuntu:)
> +        echo "We don't create EFI images for Ubuntu Desktop."
>          exit 0
>          ;;
>      ubuntu)

Had to work out why this was relevant at all, and it's because live-build/ubuntu/hooks/033-disk-image-uefi.binary is a symlink to ../../ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary; and it is present to support building hyperv images.  So yes, this looks correct.

> diff --git a/live-build/ubuntu/hooks/020-canary-live.chroot_early b/live-build/ubuntu/hooks/020-ubuntu-live.chroot_early
> similarity index 100%
> rename from live-build/ubuntu/hooks/020-canary-live.chroot_early
> rename to live-build/ubuntu/hooks/020-ubuntu-live.chroot_early
> diff --git a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
> index b27114a..1e7bc46 100644
> --- a/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
> +++ b/live-build/ubuntu/hooks/040-hyperv-desktop-images.binary
> @@ -3,7 +3,7 @@
>  echo "Creating Hyper-V image with Desktop..."
>  
>  case ${SUBPROJECT:-} in
> -    minimized|canary)
> +    minimized|"")
>          echo "We don't create minimized images for $0."
>          exit 0
>          ;;

What I don't understand here is, why is this hook currently being run for the canary image build but not for the daily-live build? (determined by checking the logs) And if something is stopping this hook from running currently, what will ensure the 020-canary-enhanced-sb.binary hook will run after this merge?

And, does disabling this hook when $SUBPROJECT is empty break the hyperv image builds, wherever those are currently happening?



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