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

[Dan Bungert]

Review: Approve

Looks correct to me, I have one further suggestion.

About the layers - desktop and desktop-canary should both drop the minimal layer to simplify image construction, but I don't see that as a requirement for this MP given that we're making desktop-canary more similar to desktop, and desktop still has the minimal layer.

Diff comments:

> diff --git a/live-build/auto/config b/live-build/auto/config
> index f881cc8..b77a824 100755
> --- a/live-build/auto/config
> +++ b/live-build/auto/config
> @@ -744,6 +744,13 @@ case $PROJECT in
>  				remove_package minimal.standard.live ubiquity-frontend-gtk
>  				# the enhanced-secureboot layer, contains all packages for the enhanced secureboot install
>  				add_package minimal.standard.enhanced-secureboot cryptsetup boot-managed-by-snapd
> +
> +                # language support

looks like the whitespace is a bit off, understandable given that that file is a mix

> +				seeded_langs="$(get_seeded_languages desktop-minimal desktop)"
> +				echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages
> +				derive_language_layers minimal desktop-minimal desktop-minimal-default-languages "$seeded_langs"
> +				derive_language_layers minimal.standard desktop desktop-default-languages "$seeded_langs"
> +
>  				# now let's create the neccessary catalog files
>  				# TODO: make sure that we handle locale_support: langpack correctly
>  				cat <<-EOF > config/minimal.catalog-in.yaml
> @@ -753,7 +760,7 @@ case $PROJECT in
>  					id: ubuntu-desktop-minimal

Let's also drop the minimal layer catalog entry, to match non-canary.

>  					type: fsimage-layered
>  					variant: desktop
> -					locale_support: none
> +					locale_support: langpack
>  				EOF
>  				cat <<-EOF > config/minimal.standard.catalog-in.yaml
>  					name: "Ubuntu Desktop"


-- 
https://code.launchpad.net/~ubuntu-core-dev/livecd-rootfs/+git/livecd-rootfs/+merge/447201
Your team Ubuntu Core Development Team is requested to review the proposed merge of livecd-rootfs:canary-locale into livecd-rootfs:ubuntu/master.