Merge branch 'canary-locale' of git+ssh://git.launchpad.net/livecd-rootfs into ubuntu/master

debian/changelog

@@ -1,3 +1,9 @@
+livecd-rootfs (23.10.11) UNRELEASED; urgency=medium
+
+  * canary: enable locale support for canary layers.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Mon, 07 Aug 2023 11:30:43 +0200
+
 livecd-rootfs (23.10.10) mantic; urgency=medium
 
   * Revert "desktop, budgie: no need to include the kernel directly, it is

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
+				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
 					type: fsimage-layered
 					variant: desktop
-					locale_support: none
+					locale_support: langpack
 				EOF
 				cat <<-EOF > config/minimal.standard.catalog-in.yaml
 					name: "Ubuntu Desktop"
@@ -762,7 +769,7 @@ case $PROJECT in
 					id: ubuntu-desktop
 					type: fsimage-layered
 					variant: desktop
-					locale_support: none
+					locale_support: langpack
 					default: yes
 				EOF
 				cat <<-EOF > config/minimal.standard.classic.catalog-in.yaml