Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-03-31 04:41:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'xnox/X13s' into ubuntu/master

Browse Source
This commit is contained in:
Steve Langasek 2023-09-27 12:46:01 -07:00
commit e5d3ec78f6
2 changed files with 33 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
live-build/auto/build
View File

@ -642,6 +642,9 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do
oem-*) oem-*)
FLAVOUR="oem" FLAVOUR="oem"
;; ;;
laptop-*)
FLAVOUR="laptop"
;;
image-intel) image-intel)
FLAVOUR="intel" FLAVOUR="intel"
;; ;;

51
live-build/auto/config
View File

@ -715,6 +715,10 @@ case $PROJECT in
;; ;;
*) *)
touch config/universe-enabled touch config/universe-enabled
KERNEL_FLAVOURS='generic-hwe-22.04'
if [ "$SUBARCH" = "x13s" ]; then
KERNEL_FLAVOURS='laptop-23.10'
fi
PASSES_TO_LAYERS="true" PASSES_TO_LAYERS="true"
# the minimal layer, for minimal installs # the minimal layer, for minimal installs
add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages
@ -725,18 +729,37 @@ case $PROJECT in
add_task minimal.standard.live ubuntu-live add_task minimal.standard.live ubuntu-live
remove_package minimal.standard.live ubiquity-frontend-gtk remove_package minimal.standard.live ubiquity-frontend-gtk
add_snap minimal.standard.live ubuntu-desktop-installer/classic add_snap minimal.standard.live ubuntu-desktop-installer/classic
add_package minimal.standard.live linux-generic-hwe-22.04 casper add_package minimal.standard.live linux-$KERNEL_FLAVOURS casper
# the enhanced-secureboot layer, contains all packages for the enhanced secureboot install
add_package minimal.enhanced-secureboot cryptsetup boot-managed-by-snapd
add_package minimal.standard.enhanced-secureboot cryptsetup boot-managed-by-snapd
# language support # language support
seeded_langs="$(get_seeded_languages desktop)" seeded_langs="$(get_seeded_languages desktop)"
echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages
derive_language_layers minimal desktop-minimal desktop-minimal-default-languages "$seeded_langs" derive_language_layers minimal desktop-minimal desktop-minimal-default-languages "$seeded_langs"
derive_language_layers minimal.enhanced-secureboot desktop-minimal desktop-default-languages "$seeded_langs"
derive_language_layers minimal.standard desktop desktop-default-languages "$seeded_langs" derive_language_layers minimal.standard desktop desktop-default-languages "$seeded_langs"
derive_language_layers minimal.standard.enhanced-secureboot desktop desktop-default-languages "$seeded_langs"
# Enchanced secureboot stuff
case "$ARCH" in
amd64)
# the enhanced-secureboot layer, contains all packages for the enhanced secureboot install
add_package minimal.enhanced-secureboot cryptsetup boot-managed-by-snapd
add_package minimal.standard.enhanced-secureboot cryptsetup boot-managed-by-snapd
derive_language_layers minimal.enhanced-secureboot desktop-minimal desktop-default-languages "$seeded_langs"
derive_language_layers minimal.standard.enhanced-secureboot desktop desktop-default-languages "$seeded_langs"
cat <<-EOF > config/minimal.enhanced-secureboot.catalog-in.yaml
id: ubuntu-desktop-minimal
variations:
minimal-enhanced-secureboot:
path: minimal.enhanced-secureboot.squashfs
snapd_system_label: enhanced-secureboot-desktop
EOF
cat <<-EOF > config/minimal.standard.enhanced-secureboot.catalog-in.yaml
id: ubuntu-desktop
variations:
enhanced-secureboot:
path: minimal.standard.enhanced-secureboot.squashfs
snapd_system_label: enhanced-secureboot-desktop
EOF
;;
esac
# now let's create the neccessary catalog files # now let's create the neccessary catalog files
cat <<-EOF > config/minimal.catalog-in.yaml cat <<-EOF > config/minimal.catalog-in.yaml
@ -752,13 +775,6 @@ case $PROJECT in
minimal: minimal:
path: minimal.squashfs path: minimal.squashfs
EOF EOF
cat <<-EOF > config/minimal.enhanced-secureboot.catalog-in.yaml
id: ubuntu-desktop-minimal
variations:
minimal-enhanced-secureboot:
path: minimal.enhanced-secureboot.squashfs
snapd_system_label: enhanced-secureboot-desktop
EOF
cat <<-EOF > config/minimal.standard.catalog-in.yaml cat <<-EOF > config/minimal.standard.catalog-in.yaml
name: "Ubuntu Desktop" name: "Ubuntu Desktop"
description: >- description: >-
@ -771,13 +787,6 @@ case $PROJECT in
standard: standard:
path: minimal.standard.squashfs path: minimal.standard.squashfs
EOF EOF
cat <<-EOF > config/minimal.standard.enhanced-secureboot.catalog-in.yaml
id: ubuntu-desktop
variations:
enhanced-secureboot:
path: minimal.standard.enhanced-secureboot.squashfs
snapd_system_label: enhanced-secureboot-desktop
EOF
/usr/share/livecd-rootfs/checkout-translations-branch \ /usr/share/livecd-rootfs/checkout-translations-branch \
https://git.launchpad.net/subiquity po config/catalog-translations https://git.launchpad.net/subiquity po config/catalog-translations
;; ;;