Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-06 08:51:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Łukasz 'sil2100' Zemczak 2023-08-07 11:31:02 +02:00
commit 494ef427e8
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
debian/changelog vendored
View File

@ -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

11
live-build/auto/config
View File

@ -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