From 09cec13e374a650d804e40f63cd707f79540fbdb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Wed, 19 Jul 2023 17:15:57 +0200 Subject: [PATCH 1/2] canary: attempt to enable locale support for canary layers. --- debian/changelog | 6 ++++++ live-build/auto/config | 11 +++++++++-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0c110513..08cf7bd7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (23.10.4ubuntu1) UNRELEASED; urgency=medium + + * canary: enable locale support for canary layers. + + -- Łukasz 'sil2100' Zemczak Wed, 19 Jul 2023 16:36:35 +0200 + livecd-rootfs (23.10.4) mantic; urgency=medium * canary: use new 23.10 models for both the live and enhanced-sb layers. diff --git a/live-build/auto/config b/live-build/auto/config index f881cc87..b77a8245 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 + 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 From 4cc5d379008f795bffd356f8403a53744de6208a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Thu, 3 Aug 2023 12:48:47 +0200 Subject: [PATCH 2/2] Fix changelog version and whitespace. --- debian/changelog | 2 +- live-build/auto/config | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 08cf7bd7..fe42b9b8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (23.10.4ubuntu1) UNRELEASED; urgency=medium +livecd-rootfs (23.10.5) UNRELEASED; urgency=medium * canary: enable locale support for canary layers. diff --git a/live-build/auto/config b/live-build/auto/config index b77a8245..8b9edc94 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -745,7 +745,7 @@ case $PROJECT in # 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 + # 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"