Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-05-11 02:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'meta-squash-fs' into ubuntu/master

Browse Source
This commit is contained in:
Steve Langasek 2023-08-17 08:16:49 -07:00
commit 94ab5c0f7a
2 changed files with 39 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
debian/changelog vendored
View File

@ -1,3 +1,11 @@
livecd-rootfs (23.10.17) UNRELEASED; urgency=medium
* Merge the minimal and standard layers on the Ubuntu Desktop images
(both daily-live and canary), now that there is no separate minimal
install target.
-- Steve Langasek <steve.langasek@ubuntu.com> Wed, 16 Aug 2023 14:19:02 -0700
livecd-rootfs (23.10.16) mantic; urgency=medium livecd-rootfs (23.10.16) mantic; urgency=medium
* fix: Do not install recommends for ubuntu-cpc minimized project (LP: #2031640) * fix: Do not install recommends for ubuntu-cpc minimized project (LP: #2031640)

71
live-build/auto/config
View File

@ -723,36 +723,30 @@ case $PROJECT in
;; ;;
canary) canary)
PASSES_TO_LAYERS="true" PASSES_TO_LAYERS="true"
# the minimal layer, for minimal installs
add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages
add_package minimal cloud-init
# the standard layer, contains all base common packages for later layers (we're splitting out the snaps) # the standard layer, contains all base common packages for later layers (we're splitting out the snaps)
add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
add_package standard cloud-init
# the classic layer, basically only contains snaps from the standard and minimal tasks # the classic layer, basically only contains snaps from the standard and minimal tasks
add_pass minimal.standard.classic add_pass standard.classic
if [ -e "config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full" ]; then if [ -e "config/package-lists/livecd-rootfs.snaplist.chroot_standard.full" ]; then
cat config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full >>config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.classic.full cat config/package-lists/livecd-rootfs.snaplist.chroot_standard.full >>config/package-lists/livecd-rootfs.snaplist.chroot_standard.classic.full
rm config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full rm config/package-lists/livecd-rootfs.snaplist.chroot_standard.full
fi
if [ -e "config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full" ]; then
cat config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full >>config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.classic.full
rm config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.full
fi fi
# the live layer, contains all packages for the live session installer # the live layer, contains all packages for the live session installer
# TODO: we should probably add the kernel per KERNEL_FLAVOURS # TODO: we should probably add the kernel per KERNEL_FLAVOURS
add_package minimal.standard.live linux-generic casper lvm2 mdadm cryptsetup dctrl-tools add_package standard.live linux-generic casper lvm2 mdadm cryptsetup dctrl-tools
remove_package minimal.standard.live ubiquity-frontend-gtk remove_package standard.live ubiquity-frontend-gtk
# the enhanced-secureboot layer, contains all packages for the enhanced secureboot install # the enhanced-secureboot layer, contains all packages for the enhanced secureboot install
add_package minimal.standard.enhanced-secureboot cryptsetup boot-managed-by-snapd add_package standard.enhanced-secureboot cryptsetup boot-managed-by-snapd
# language support # language support
seeded_langs="$(get_seeded_languages desktop-minimal 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.standard.classic desktop desktop-default-languages "$seeded_langs" derive_language_layers standard.classic desktop desktop-default-languages "$seeded_langs"
derive_language_layers minimal.standard.enhanced-secureboot desktop desktop-default-languages "$seeded_langs" derive_language_layers standard.enhanced-secureboot desktop desktop-default-languages "$seeded_langs"
# now let's create the neccessary catalog files # now let's create the neccessary catalog files
cat <<-EOF > config/minimal.standard.catalog-in.yaml cat <<-EOF > config/standard.catalog-in.yaml
name: "Ubuntu Desktop" name: "Ubuntu Desktop"
description: >- description: >-
A full featured Ubuntu Desktop. A full featured Ubuntu Desktop.
@ -762,17 +756,17 @@ case $PROJECT in
locale_support: langpack locale_support: langpack
default: yes default: yes
EOF EOF
cat <<-EOF > config/minimal.standard.classic.catalog-in.yaml cat <<-EOF > config/standard.classic.catalog-in.yaml
id: ubuntu-desktop id: ubuntu-desktop
variations: variations:
classic: classic:
path: minimal.standard.classic.squashfs path: standard.classic.squashfs
EOF EOF
cat <<-EOF > config/minimal.standard.enhanced-secureboot.catalog-in.yaml cat <<-EOF > config/standard.enhanced-secureboot.catalog-in.yaml
id: ubuntu-desktop id: ubuntu-desktop
variations: variations:
enhanced-secureboot: enhanced-secureboot:
path: minimal.standard.enhanced-secureboot.squashfs path: standard.enhanced-secureboot.squashfs
snapd_system_label: enhanced-secureboot-desktop snapd_system_label: enhanced-secureboot-desktop
EOF EOF
/usr/share/livecd-rootfs/checkout-translations-branch \ /usr/share/livecd-rootfs/checkout-translations-branch \
@ -782,18 +776,16 @@ case $PROJECT in
touch config/universe-enabled touch config/universe-enabled
PASSES_TO_LAYERS="true" PASSES_TO_LAYERS="true"
KERNEL_FLAVOURS='generic-hwe-22.04' KERNEL_FLAVOURS='generic-hwe-22.04'
add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages add_task standard.live ubuntu-live
add_task minimal.standard.live ubuntu-live add_package standard cloud-init
add_package minimal cloud-init remove_package standard.live ubiquity-frontend-gtk
remove_package minimal.standard.live ubiquity-frontend-gtk add_snap standard.live ubuntu-desktop-installer/classic
add_snap minimal.standard.live ubuntu-desktop-installer/classic
seeded_langs="$(get_seeded_languages desktop-minimal 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 standard desktop desktop-default-languages "$seeded_langs"
derive_language_layers minimal.standard desktop desktop-default-languages "$seeded_langs" cat <<-EOF > config/standard.catalog-in.yaml
cat <<-EOF > config/minimal.standard.catalog-in.yaml
name: "Ubuntu Desktop" name: "Ubuntu Desktop"
description: >- description: >-
Ubuntu Desktop. Ubuntu Desktop.
@ -814,14 +806,13 @@ case $PROJECT in
PASSES_TO_LAYERS="true" PASSES_TO_LAYERS="true"
#KERNEL_FLAVOURS='oem-22.04' #KERNEL_FLAVOURS='oem-22.04'
KERNEL_FLAVOURS='generic-hwe-22.04' KERNEL_FLAVOURS='generic-hwe-22.04'
add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages add_task standard.live ubuntu-live
add_task minimal.standard.live ubuntu-live add_package standard cloud-init
add_package minimal cloud-init remove_package standard.live ubiquity-frontend-gtk
remove_package minimal.standard.live ubiquity-frontend-gtk add_snap standard.live ubuntu-desktop-installer/classic
add_snap minimal.standard.live ubuntu-desktop-installer/classic
cat <<-EOF > config/minimal.standard.catalog-in.yaml cat <<-EOF > config/standard.catalog-in.yaml
name: "Ubuntu Desktop for OEM" name: "Ubuntu Desktop for OEM"
description: >- description: >-
Ubuntu Desktop for OEM preinstallation. Ubuntu Desktop for OEM preinstallation.