From d3a75c9becfe1db77bc1ba254af9370ce2e40e3f Mon Sep 17 00:00:00 2001 From: Steve Langasek Date: Tue, 22 Aug 2023 11:47:59 -0700 Subject: [PATCH] Consolidate canary layers to merge 'classic' back into 'standard' --- debian/changelog | 4 ++++ live-build/auto/config | 17 ++++------------- 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 4c1d50aa..8b04bb67 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ livecd-rootfs (23.10.21) UNRELEASED; urgency=medium * Deduplicate the layers just before creating the squashfs, to enable deduplication of the result of binary hooks as well. + [ Steve Langasek ] + * Deduplicate snaps between squashfs layers on classic: + - Consolidate canary layers to merge 'classic' back into 'standard' + -- Michael Hudson-Doyle Wed, 23 Aug 2023 11:15:26 +1200 livecd-rootfs (23.10.20) mantic; urgency=medium diff --git a/live-build/auto/config b/live-build/auto/config index 8cc08676..c2e969fc 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -723,15 +723,9 @@ case $PROJECT in ;; canary) PASSES_TO_LAYERS="true" - # 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 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 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 standard.live linux-generic casper lvm2 mdadm cryptsetup dctrl-tools @@ -742,7 +736,7 @@ case $PROJECT in # language support seeded_langs="$(get_seeded_languages desktop)" echo "$seeded_langs" | tr ' ' ',' > config/seeded-languages - derive_language_layers standard.classic desktop desktop-default-languages "$seeded_langs" + derive_language_layers standard 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 @@ -755,12 +749,9 @@ case $PROJECT in variant: desktop locale_support: langpack default: yes - EOF - cat <<-EOF > config/standard.classic.catalog-in.yaml - id: ubuntu-desktop variations: - classic: - path: standard.classic.squashfs + standard: + path: standard.squashfs EOF cat <<-EOF > config/standard.enhanced-secureboot.catalog-in.yaml id: ubuntu-desktop