From 6f1fc57ebcd6d4d9fe1c04145d6694c60f683554 Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Wed, 16 Aug 2023 14:35:27 -0700 Subject: [PATCH] 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. --- debian/changelog | 8 +++++ live-build/auto/config | 73 ++++++++++++++++++------------------------ 2 files changed, 40 insertions(+), 41 deletions(-) diff --git a/debian/changelog b/debian/changelog index 764e97cb..341ad468 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (23.10.15) 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 Wed, 16 Aug 2023 14:19:02 -0700 + livecd-rootfs (23.10.14) mantic; urgency=medium * canary diff --git a/live-build/auto/config b/live-build/auto/config index c9157d07..167d9416 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -723,36 +723,30 @@ case $PROJECT in ;; canary) 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) - 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 - add_pass minimal.standard.classic - if [ -e "config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full" ]; then - cat config/package-lists/livecd-rootfs.snaplist.chroot_minimal.full >>config/package-lists/livecd-rootfs.snaplist.chroot_minimal.standard.classic.full - rm config/package-lists/livecd-rootfs.snaplist.chroot_minimal.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 + add_pass standard.classic + if [ -e "config/package-lists/livecd-rootfs.snaplist.chroot_standard.full" ]; then + 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_standard.full fi # the live layer, contains all packages for the live session installer # TODO: we should probably add the kernel per KERNEL_FLAVOURS - add_package minimal.standard.live linux-generic casper lvm2 mdadm cryptsetup dctrl-tools - remove_package minimal.standard.live ubiquity-frontend-gtk + add_package standard.live linux-generic casper lvm2 mdadm cryptsetup dctrl-tools + remove_package 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 + add_package standard.enhanced-secureboot cryptsetup boot-managed-by-snapd # language support - seeded_langs="$(get_seeded_languages desktop-minimal desktop)" + seeded_langs="$(get_seeded_languages desktop)" echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages - derive_language_layers minimal.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.classic 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 - cat <<-EOF > config/minimal.standard.catalog-in.yaml + cat <<-EOF > config/standard.catalog-in.yaml name: "Ubuntu Desktop" description: >- A full featured Ubuntu Desktop. @@ -762,17 +756,17 @@ case $PROJECT in locale_support: langpack default: yes EOF - cat <<-EOF > config/minimal.standard.classic.catalog-in.yaml + cat <<-EOF > config/standard.classic.catalog-in.yaml id: ubuntu-desktop variations: classic: - path: minimal.standard.classic.squashfs + path: standard.classic.squashfs EOF - cat <<-EOF > config/minimal.standard.enhanced-secureboot.catalog-in.yaml + cat <<-EOF > config/standard.enhanced-secureboot.catalog-in.yaml id: ubuntu-desktop variations: enhanced-secureboot: - path: minimal.standard.enhanced-secureboot.squashfs + path: standard.enhanced-secureboot.squashfs snapd_system_label: enhanced-secureboot-desktop EOF /usr/share/livecd-rootfs/checkout-translations-branch \ @@ -782,18 +776,16 @@ case $PROJECT in touch config/universe-enabled PASSES_TO_LAYERS="true" KERNEL_FLAVOURS='generic-hwe-22.04' - add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages - add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages - add_task minimal.standard.live ubuntu-live - add_package minimal cloud-init - remove_package minimal.standard.live ubiquity-frontend-gtk - add_snap minimal.standard.live ubuntu-desktop-installer/classic + add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages + add_task standard.live ubuntu-live + add_package standard cloud-init + remove_package standard.live ubiquity-frontend-gtk + add_snap 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 - derive_language_layers minimal desktop-minimal desktop-minimal-default-languages "$seeded_langs" - derive_language_layers minimal.standard desktop desktop-default-languages "$seeded_langs" - cat <<-EOF > config/minimal.standard.catalog-in.yaml + derive_language_layers standard desktop desktop-default-languages "$seeded_langs" + cat <<-EOF > config/standard.catalog-in.yaml name: "Ubuntu Desktop" description: >- Ubuntu Desktop. @@ -814,14 +806,13 @@ case $PROJECT in PASSES_TO_LAYERS="true" #KERNEL_FLAVOURS='oem-22.04' KERNEL_FLAVOURS='generic-hwe-22.04' - add_task minimal minimal standard ubuntu-desktop-minimal ubuntu-desktop-minimal-default-languages - add_task minimal.standard ubuntu-desktop ubuntu-desktop-default-languages - add_task minimal.standard.live ubuntu-live - add_package minimal cloud-init - remove_package minimal.standard.live ubiquity-frontend-gtk - add_snap minimal.standard.live ubuntu-desktop-installer/classic - - cat <<-EOF > config/minimal.standard.catalog-in.yaml + add_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages + add_task standard.live ubuntu-live + add_package standard cloud-init + remove_package standard.live ubiquity-frontend-gtk + add_snap standard.live ubuntu-desktop-installer/classic + + cat <<-EOF > config/standard.catalog-in.yaml name: "Ubuntu Desktop for OEM" description: >- Ubuntu Desktop for OEM preinstallation.