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

Consolidate canary layers to merge 'classic' back into 'standard'

Browse Source
This commit is contained in:
Steve Langasek 2023-08-22 11:47:59 -07:00 committed by Michael Hudson-Doyle
parent 6890dfe5ca
commit d3a75c9bec
2 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/changelog vendored
View File

@ -3,6 +3,10 @@ livecd-rootfs (23.10.21) UNRELEASED; urgency=medium
* Deduplicate the layers just before creating the squashfs, to enable * Deduplicate the layers just before creating the squashfs, to enable
deduplication of the result of binary hooks as well. 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 <michael.hudson@ubuntu.com> Wed, 23 Aug 2023 11:15:26 +1200 -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Wed, 23 Aug 2023 11:15:26 +1200
livecd-rootfs (23.10.20) mantic; urgency=medium livecd-rootfs (23.10.20) mantic; urgency=medium

17
live-build/auto/config
View File

@ -723,15 +723,9 @@ case $PROJECT in
;; ;;
canary) canary)
PASSES_TO_LAYERS="true" 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_task standard minimal standard ubuntu-desktop ubuntu-desktop-default-languages
add_package standard cloud-init 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 # 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 standard.live linux-generic casper lvm2 mdadm cryptsetup dctrl-tools add_package standard.live linux-generic casper lvm2 mdadm cryptsetup dctrl-tools
@ -742,7 +736,7 @@ case $PROJECT in
# 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 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" 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
@ -755,12 +749,9 @@ case $PROJECT in
variant: desktop variant: desktop
locale_support: langpack locale_support: langpack
default: yes default: yes
EOF
cat <<-EOF > config/standard.classic.catalog-in.yaml
id: ubuntu-desktop
variations: variations:
classic: standard:
path: standard.classic.squashfs path: standard.squashfs
EOF EOF
cat <<-EOF > config/standard.enhanced-secureboot.catalog-in.yaml cat <<-EOF > config/standard.enhanced-secureboot.catalog-in.yaml
id: ubuntu-desktop id: ubuntu-desktop