From 06defc43482fabbc48c5e3a5a14ec3bbe60d26a5 Mon Sep 17 00:00:00 2001 From: Utkarsh Gupta Date: Wed, 19 Jul 2023 15:05:27 +0530 Subject: [PATCH 01/14] Use ubuntu-cloud-minimal metapackage in minimized CPC images Now that we have the cloud-minimal seed for minimized cloud image builds, we should drop all the workarounds and hacks we once needed when we were using the server seed. We can directly use the new metapackage and get rid of the tasks and other autoremoves, et al. --- live-build/auto/config | 9 ++++-- .../hooks.d/chroot/999-cpc-fixes.chroot | 31 ------------------- 2 files changed, 6 insertions(+), 34 deletions(-) diff --git a/live-build/auto/config b/live-build/auto/config index f881cc87..b5c722a4 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -1109,8 +1109,7 @@ case $PROJECT in KERNEL_FLAVOURS=virtual if [ "${SUBPROJECT:-}" = minimized ]; then - add_task install cloud-image - add_package install sudo lxd-installer + add_package install ubuntu-cloud-minimal else add_task install minimal standard cloud-image add_package install ubuntu-minimal @@ -1210,7 +1209,11 @@ case $PROJECT:${SUBPROJECT:-} in BASE_SEED='wsl' ;; ubuntu-cpc:*) - BASE_SEED='server' + # we don't preseed any snaps in minimized images, so no need to set + # BASE_SEED in that case. + if [ "${SUBPROJECT:-}" != minimized ]; then + BASE_SEED='server' + fi ;; ubuntu-server:live) BASE_SEED='server' diff --git a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot index 9a25c0a0..6d7b62ea 100755 --- a/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot +++ b/live-build/ubuntu-cpc/hooks.d/chroot/999-cpc-fixes.chroot @@ -91,37 +91,6 @@ if [ -L "${rootd}/boot/initrd.img" ] && [ ! -e "${rootd}/boot/initrd.img" ]; the rm "${rootd}/boot/initrd.img" fi -# Recommends of ubuntu-server that should not be included in cloud images by -# default -# unfortunately because we are currently installing ubuntu-server as a task, -# all of the recursive dependencies are marked as manually installed and are -# not subject to autoremoval. There is discussion of us stopping the use of -# tasks in livecd-rootfs but in the meantime, we have to also explicitly -# remove the packages providing the services -_xchroot "$rootd" env DEBIAN_FRONTEND=noninteractive \ - apt-get -y autoremove --purge fwupd modemmanager udisks2 - -if [ "${SUBPROJECT:-}" = minimized ]; then - # Remove various packages that we don't want in the minimized images. - # Some of these are tools that don't make sense by default - # non-interactively; some are libraries whose reverse-dependencies - # will have already been removed; open-vm-tools, it's a bug that this - # is in the common cloud seed because this should only be included - # in VMWare guest images, and we know none of the minimized images - # are targeted at VMWare. - _xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \ - apt-mark auto '^lib.*' '^python*' vim-runtime 2>/dev/null - # FIXME: iso-codes is a dep of software-properties and shouldn't be - _xchroot "${rootd}" env DEBIAN_FRONTEND=noninteractive \ - apt-get -y autoremove --purge iso-codes xauth pastebinit \ - plymouth open-vm-tools git git-man shared-mime-info vim vim-common \ - console-setup ncurses-term tmux screen policykit-1 \ - xdg-user-dirs less publicsuffix run-one apport-symptoms \ - ubuntu-cloudimage-keyring file - - _xchroot "${rootd}" apt clean -fi - #### END COMMON ARCH FUNCTIONS From 0595a12093cb8c146d4c44d01481b8a3286b4859 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 28 Jul 2023 11:03:44 +1200 Subject: [PATCH 02/14] add changelog entry for previous merge --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0c110513..ae1a86ba 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (23.10.5) UNRELEASED; urgency=medium + + [ Utkarsh Gupta ] + * Use ubuntu-cloud-minimal metapackage in minimized CPC images rather than + cloud-image task which brings in snaps that are unwanted in minimized + builds. + + -- Michael Hudson-Doyle Fri, 28 Jul 2023 11:01:45 +1200 + livecd-rootfs (23.10.4) mantic; urgency=medium * canary: use new 23.10 models for both the live and enhanced-sb layers. From 777fe1f699ea9f66c85e33b832c12be3a9bdb716 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 28 Jul 2023 11:05:57 +1200 Subject: [PATCH 03/14] releasing package livecd-rootfs version 23.10.5 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index ae1a86ba..dee62f11 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,11 @@ -livecd-rootfs (23.10.5) UNRELEASED; urgency=medium +livecd-rootfs (23.10.5) mantic; urgency=medium [ Utkarsh Gupta ] * Use ubuntu-cloud-minimal metapackage in minimized CPC images rather than cloud-image task which brings in snaps that are unwanted in minimized builds. - -- Michael Hudson-Doyle Fri, 28 Jul 2023 11:01:45 +1200 + -- Michael Hudson-Doyle Fri, 28 Jul 2023 11:05:44 +1200 livecd-rootfs (23.10.4) mantic; urgency=medium From c42f2ef3b180dd2ace8cf0ebdb539ded94b4464b Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Fri, 28 Jul 2023 14:55:25 +1200 Subject: [PATCH 04/14] live-build/ubuntu-cpc/hooks.d/base/disk-image-*.binary: Fix invocations of force_boot_without_initramfs to pass "mountpoint" and not "${mountpoint}" (which actually worked on most arches for VERY BAD reasons but fails on s390x). --- debian/changelog | 9 +++++++++ .../hooks.d/base/disk-image-uefi-non-cloud.binary | 2 +- .../ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- live-build/ubuntu-cpc/hooks.d/base/disk-image.binary | 2 +- 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index dee62f11..4a20e489 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (23.10.6) UNRELEASED; urgency=medium + + * live-build/ubuntu-cpc/hooks.d/base/disk-image-*.binary: Fix invocations of + force_boot_without_initramfs to pass "mountpoint" and not "${mountpoint}" + (which actually worked on most arches for VERY BAD reasons but fails on + s390x). + + -- Michael Hudson-Doyle Fri, 28 Jul 2023 14:40:13 +1200 + livecd-rootfs (23.10.5) mantic; urgency=medium [ Utkarsh Gupta ] diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary index e372443b..bcc04e28 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary @@ -408,7 +408,7 @@ EOF # Use initrdless boot for minimal images if [ "${SUBPROJECT:-}" = "minimized" ]; then - force_boot_without_initramfs ${mountpoint} + force_boot_without_initramfs mountpoint fi # This call to rewrite the debian package manifest is added here to capture diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index b1acc14b..020dd33f 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -128,7 +128,7 @@ install_grub() { # Use initrdless boot for minimal images if [ "${SUBPROJECT:-}" = "minimized" ]; then - force_boot_without_initramfs ${mountpoint} + force_boot_without_initramfs mountpoint fi # This call to rewrite the debian package manifest is added here to capture diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary index 68b1888a..253f4c69 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary @@ -133,7 +133,7 @@ fi # Use initrdless boot for minimal images if [ "${SUBPROJECT:-}" = "minimized" ]; then - force_boot_without_initramfs ${mountpoint} + force_boot_without_initramfs mountpoint fi if [ "$ARCH" = "s390x" ]; then From 37341541b4be9226e048c7c686e9be199374e2ae Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Sat, 29 Jul 2023 07:34:35 +1200 Subject: [PATCH 05/14] live-build/ubuntu-cpc/hooks.d/base/disk-image.binary: Do not call force_boot_without_initramfs on s390x. --- debian/changelog | 2 ++ live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 4a20e489..aa157f09 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ livecd-rootfs (23.10.6) UNRELEASED; urgency=medium force_boot_without_initramfs to pass "mountpoint" and not "${mountpoint}" (which actually worked on most arches for VERY BAD reasons but fails on s390x). + * live-build/ubuntu-cpc/hooks.d/base/disk-image.binary: Do not call + force_boot_without_initramfs on s390x. -- Michael Hudson-Doyle Fri, 28 Jul 2023 14:40:13 +1200 diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 020dd33f..3c5a488d 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -127,7 +127,7 @@ install_grub() { fi # Use initrdless boot for minimal images - if [ "${SUBPROJECT:-}" = "minimized" ]; then + if [ "${SUBPROJECT:-}" = "minimized" ] && [ "$ARCH" != "s390x" ]; then force_boot_without_initramfs mountpoint fi From 41f4783f19135ec45048d781cc27773ba85a974e Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Sat, 29 Jul 2023 07:56:41 +1200 Subject: [PATCH 06/14] releasing package livecd-rootfs version 23.10.6 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index aa157f09..61b71b0f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (23.10.6) UNRELEASED; urgency=medium +livecd-rootfs (23.10.6) mantic; urgency=medium * live-build/ubuntu-cpc/hooks.d/base/disk-image-*.binary: Fix invocations of force_boot_without_initramfs to pass "mountpoint" and not "${mountpoint}" @@ -7,7 +7,7 @@ livecd-rootfs (23.10.6) UNRELEASED; urgency=medium * live-build/ubuntu-cpc/hooks.d/base/disk-image.binary: Do not call force_boot_without_initramfs on s390x. - -- Michael Hudson-Doyle Fri, 28 Jul 2023 14:40:13 +1200 + -- Michael Hudson-Doyle Sat, 29 Jul 2023 07:56:28 +1200 livecd-rootfs (23.10.5) mantic; urgency=medium From d3dfb12f8599ef86f4c3036088f5444c64f59ac2 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Sat, 29 Jul 2023 13:02:56 +1200 Subject: [PATCH 07/14] Actually fix live-build/ubuntu-cpc/hooks.d/base/disk-image.binary to not call force_boot_without_initramfs on s390x rather than disk-image-uefi.binary which obviously would never run on s390x. --- debian/changelog | 8 ++++++++ live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary | 2 +- live-build/ubuntu-cpc/hooks.d/base/disk-image.binary | 8 ++++---- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index 61b71b0f..6a3d2184 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +livecd-rootfs (23.10.7) UNRELEASED; urgency=medium + + * Actually fix live-build/ubuntu-cpc/hooks.d/base/disk-image.binary to not + call force_boot_without_initramfs on s390x rather than + disk-image-uefi.binary which obviously would never run on s390x. + + -- Michael Hudson-Doyle Sat, 29 Jul 2023 13:00:37 +1200 + livecd-rootfs (23.10.6) mantic; urgency=medium * live-build/ubuntu-cpc/hooks.d/base/disk-image-*.binary: Fix invocations of diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary index 3c5a488d..020dd33f 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi.binary @@ -127,7 +127,7 @@ install_grub() { fi # Use initrdless boot for minimal images - if [ "${SUBPROJECT:-}" = "minimized" ] && [ "$ARCH" != "s390x" ]; then + if [ "${SUBPROJECT:-}" = "minimized" ]; then force_boot_without_initramfs mountpoint fi diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary index 253f4c69..7fcc8167 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image.binary @@ -129,11 +129,11 @@ if [ "${should_install_grub}" -eq 1 ]; then undivert_grub mountpoint rm mountpoint/tmp/device.map -fi -# Use initrdless boot for minimal images -if [ "${SUBPROJECT:-}" = "minimized" ]; then - force_boot_without_initramfs mountpoint + # Use initrdless boot for minimal images + if [ "${SUBPROJECT:-}" = "minimized" ]; then + force_boot_without_initramfs mountpoint + fi fi if [ "$ARCH" = "s390x" ]; then From cb1a24a5fbf0fd968db54479d35fd221cac5aa3a Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Sun, 30 Jul 2023 09:18:36 +1200 Subject: [PATCH 08/14] releasing package livecd-rootfs version 23.10.7 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6a3d2184..e23e241c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -livecd-rootfs (23.10.7) UNRELEASED; urgency=medium +livecd-rootfs (23.10.7) mantic; urgency=medium * Actually fix live-build/ubuntu-cpc/hooks.d/base/disk-image.binary to not call force_boot_without_initramfs on s390x rather than disk-image-uefi.binary which obviously would never run on s390x. - -- Michael Hudson-Doyle Sat, 29 Jul 2023 13:00:37 +1200 + -- Michael Hudson-Doyle Sun, 30 Jul 2023 09:17:52 +1200 livecd-rootfs (23.10.6) mantic; urgency=medium From fd75a28558ee4230db3973d0a62214de01c58faf Mon Sep 17 00:00:00 2001 From: Heinrich Schuchardt Date: Tue, 1 Aug 2023 16:06:00 +0200 Subject: [PATCH 09/14] risc-v: increase loader 2 partition for VF2 EDK II is available for the StarFive VisionFive 2 board. As it is larger than U-Boot we need to increase the size of the loader 2 partition to accommodate it. Signed-off-by: Heinrich Schuchardt --- .../hooks.d/base/disk-image-uefi-non-cloud.binary | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary index bcc04e28..781419cf 100755 --- a/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary +++ b/live-build/ubuntu-cpc/hooks.d/base/disk-image-uefi-non-cloud.binary @@ -139,15 +139,15 @@ create_partitions() { --new=13:4096:8191 \ --typecode=13:2E54B353-1271-4842-806F-E436D6AF6985 \ --change-name=13:loader1 \ - --new=2:8192:16383 \ + --new=2:8192:40959 \ --typecode=2:7a097280-70d2-44bc-886c-ff5ffbb7b098 \ --change-name=2:loader2 \ - --new=12:16384:24575 \ + --new=12:40960:49151 \ --change-name=12:CIDATA \ - --new=15:24576:229375 \ + --new=15:49152:253951 \ --typecode=15:ef00 \ --change-name=15:ESP \ - --new=1:229376: \ + --new=1:253952: \ --attributes=1:set:2 else # preinstalled server, currently FU540 From 276d577722aee78c7d07b7a60d3fe1842ae860e9 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 2 Aug 2023 13:13:34 +1200 Subject: [PATCH 10/14] add changelog entry for vf2_edk2 merge --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/debian/changelog b/debian/changelog index e23e241c..433d4798 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +livecd-rootfs (23.10.8) UNRELEASED; urgency=medium + + [ Heinrich Schuchardt ] + * risc-v: increase loader2 partition for VisionFive 2. EDK II is available + for the StarFive VisionFive 2 board. As it is larger than U-Boot we need + to increase the size of the loader 2 partition to accommodate it. + + -- Michael Hudson-Doyle Wed, 02 Aug 2023 13:12:09 +1200 + livecd-rootfs (23.10.7) mantic; urgency=medium * Actually fix live-build/ubuntu-cpc/hooks.d/base/disk-image.binary to not From cf75120068ee1fd1c207726f4f910dab911bda70 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 26 Jul 2023 20:53:05 +1200 Subject: [PATCH 11/14] lb_chroot_layered: use rsync to make more minimal overlay layers. (LP: #2028213) --- debian/changelog | 4 ++ live-build/lb_chroot_layered | 72 ++++++++---------------------------- 2 files changed, 19 insertions(+), 57 deletions(-) diff --git a/debian/changelog b/debian/changelog index 433d4798..6ee9a917 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,10 @@ livecd-rootfs (23.10.8) UNRELEASED; urgency=medium for the StarFive VisionFive 2 board. As it is larger than U-Boot we need to increase the size of the loader 2 partition to accommodate it. + [ Michael Hudson-Doyle ] + * lb_chroot_layered: use rsync to make more minimal overlay layers. + (LP: #2028213) + -- Michael Hudson-Doyle Wed, 02 Aug 2023 13:12:09 +1200 livecd-rootfs (23.10.7) mantic; urgency=medium diff --git a/live-build/lb_chroot_layered b/live-build/lb_chroot_layered index 6529ef2e..d3173755 100755 --- a/live-build/lb_chroot_layered +++ b/live-build/lb_chroot_layered @@ -107,57 +107,6 @@ lb_chroot_includes () { cd "${OLDPWD}" } -reduce_pass_size () { - # Remove duplicated files between parent and current pass - # Note the empty directories created in a child pass are not removed - local pass=$1 - local parent="$(get_parent_pass $pass)" - - $(is_root_layer $pass) && return - - pass_dir="overlay.${pass}" - parent_pass_dir="overlay.${parent}" - - local list_pass=$(mktemp) - local list_parent=$(mktemp) - - (cd $pass_dir && find . ! -type d -printf "%h/%f|%s|%y|%U|%G|%m\n"|sort > $list_pass) - (cd $parent_pass_dir && find . ! -type d -printf "%h/%f|%s|%y|%U|%G|%m\n"|sort > $list_parent) - - # Only iterate on common files with same type, owner, permission and size - comm -12 $list_pass $list_parent|cut -d'|' -f1|while read f; do - # If file contents are different, keep it - if ! diff --brief --no-dereference "$pass_dir/$f" "$parent_pass_dir/$f" >/dev/null; then - continue - fi - p="$(dirname "$f")" - while [ "$p" != . ]; do - # As explained in the overlayfs documentation - # https://www.kernel.org/doc/html/latest/filesystems/overlayfs.html#whiteouts-and-opaque-directories - # an xattr of trusted.overlay.opaque indicates an 'opaque' directory - # that was deleted from the overlay. Removing files from within the - # directory, even if identical with one in the lower layer, will result - # in it going missing from the combined filesystem. - # - # It would be possible to be more clever, e.g. if the two directories - # are still similar, we could the delete the attribute and convert any - # still-needed deletions to whiteouts but it doesn't seem worth it in - # the cases seen so far. - if [ -n "$(getfattr -n trusted.overlay.opaque -h --only-values -- "$pass_dir/$p" 2>/dev/null)" ]; then - Echo_message "reduce_pass_size: '%s' would be removed from overlay but for trusted.overlay.opaque on '%s'" "$f" "$p" - continue 2 - fi - p="$(dirname "$p")" - done - # Files are strictly identical between the 2 passes (only mod or access times differs). No need for unused delta. - Echo_message "reduce_pass_size: '%s' is strictly identical between %s and %s. Removing." "$f" "$pass" "$parent" - rm "$pass_dir/$f" - done - - rm $list_pass - rm $list_parent -} - create_chroot_pass () { local pass=$1 shift 1 # restore ${*} @@ -182,8 +131,8 @@ create_chroot_pass () { mkdir -p "$overlay_dir/" lowerdirs=$(get_lowerdirs_for_pass $pass) if [ -n "$lowerdirs" ]; then - mkdir -p chroot/ - mount_overlay "$lowerdirs" "$overlay_dir" chroot/ + mkdir -p chroot "${overlay_dir}-initial" + mount_overlay "$lowerdirs" "${overlay_dir}-initial" chroot/ else ln -s "$overlay_dir/" chroot fi @@ -319,13 +268,22 @@ create_chroot_pass () { lb chroot_devpts remove ${*} if [ -n "$lowerdirs" ]; then - umount chroot - rmdir chroot + # Although the current chroot was created as an overlay over + # the previous layer, many operations can result in redundant + # files in the upperdir. Rather than trying to minimize the + # overlay by hand, we rsync the chroot into a fresh overlay, + # rely on rsyncs ability to avoid redundant file operations, + # and take _that_ overlay's upperdir as the content of the + # layer. + mkdir chroot-2 + mount_overlay "$lowerdirs" "$overlay_dir" chroot-2/ + rsync -aXHAS --del chroot/ chroot-2/ + umount chroot chroot-2 + rmdir chroot chroot-2 + rm -rf ${overlay_dir}-initial else rm chroot fi - - reduce_pass_size $pass } if [ ! -d chroot.bootstrap/ ]; then From 101e5b6f19d1c666ef53c9fac9cb3f6bf1417721 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Wed, 2 Aug 2023 13:19:51 +1200 Subject: [PATCH 12/14] releasing package livecd-rootfs version 23.10.8 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 6ee9a917..7d01eb77 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -livecd-rootfs (23.10.8) UNRELEASED; urgency=medium +livecd-rootfs (23.10.8) mantic; urgency=medium [ Heinrich Schuchardt ] * risc-v: increase loader2 partition for VisionFive 2. EDK II is available @@ -9,7 +9,7 @@ livecd-rootfs (23.10.8) UNRELEASED; urgency=medium * lb_chroot_layered: use rsync to make more minimal overlay layers. (LP: #2028213) - -- Michael Hudson-Doyle Wed, 02 Aug 2023 13:12:09 +1200 + -- Michael Hudson-Doyle Wed, 02 Aug 2023 13:19:29 +1200 livecd-rootfs (23.10.7) mantic; urgency=medium From 6010b5de5e03d88a7bb018c60aaa4fb273af0e90 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Thu, 27 Jul 2023 18:15:36 -0600 Subject: [PATCH 13/14] desktop: KERNEL_FLAVOURS=none no need to include the kernel directly, it is installed at runtime (LP: #2026225) --- debian/changelog | 7 +++++++ live-build/auto/config | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 7d01eb77..80a9e0e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (23.10.9) mantic; urgency=medium + + * desktop: no need to include the kernel directly, it is installed at + runtime (LP: #2026225) + + -- Dan Bungert Wed, 02 Aug 2023 13:16:00 -0600 + livecd-rootfs (23.10.8) mantic; urgency=medium [ Heinrich Schuchardt ] diff --git a/live-build/auto/config b/live-build/auto/config index b5c722a4..24cf03c5 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -784,7 +784,9 @@ case $PROJECT in *) touch config/universe-enabled PASSES_TO_LAYERS="true" - KERNEL_FLAVOURS='generic-hwe-22.04' + OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" + KERNEL_FLAVOURS=none + BINARY_REMOVE_LINUX=false 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 From 95b37dcb8ca826272b988194ebf3b0f62a997427 Mon Sep 17 00:00:00 2001 From: Dan Bungert Date: Thu, 27 Jul 2023 18:21:33 -0600 Subject: [PATCH 14/14] budgie: KERNEL_FLAVOURS=none --- debian/changelog | 4 ++-- live-build/auto/config | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 80a9e0e2..ccadf03a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ livecd-rootfs (23.10.9) mantic; urgency=medium - * desktop: no need to include the kernel directly, it is installed at - runtime (LP: #2026225) + * desktop, budgie: no need to include the kernel directly, it is installed + at runtime (LP: #2026225) -- Dan Bungert Wed, 02 Aug 2023 13:16:00 -0600 diff --git a/live-build/auto/config b/live-build/auto/config index 24cf03c5..e440c459 100755 --- a/live-build/auto/config +++ b/live-build/auto/config @@ -923,7 +923,9 @@ case $PROJECT in *) # By default Ubuntu Budgie now ships the new installer. PASSES_TO_LAYERS="true" - KERNEL_FLAVOURS='generic-hwe-22.04' + OPTS="${OPTS:+$OPTS }--linux-packages=none --initramfs=none" + KERNEL_FLAVOURS=none + BINARY_REMOVE_LINUX=false add_task minimal minimal standard ubuntu-budgie-desktop-minimal ubuntu-budgie-desktop-minimal-default-languages add_task minimal.standard ubuntu-budgie-desktop ubuntu-budgie-desktop-default-languages add_task minimal.standard.live ubuntu-budgie-live