From 8c127ebec12fd6f2dbcca27b83c23ba94c039f76 Mon Sep 17 00:00:00 2001 From: CloudBuilder Date: Sat, 16 Sep 2023 15:51:08 +0000 Subject: [PATCH] Imported 23.10.37 from mantic-release pocket. No reason for CPC update specified. --- debian/changelog | 7 +++++++ live-build/auto/build | 6 +----- live-build/ubuntu-cpc/hooks.d/base/series/disk-image | 2 -- live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi | 2 -- minimize-manual | 8 ++++---- 5 files changed, 12 insertions(+), 13 deletions(-) diff --git a/debian/changelog b/debian/changelog index 815c5d77..0732ef1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (23.10.37) mantic; urgency=medium + + * fix: ensure minimize-manual script uses passed in argument for all commands (LP: #2036198) + * fix: armhf flavour for 6.5+ kernel is now generic (LP: #2036192) + + -- Philip Roche Fri, 15 Sep 2023 11:58:23 +0100 + livecd-rootfs (23.10.36) mantic; urgency=medium * Since we restored the minimal layer, we also need to adjust all hook diff --git a/live-build/auto/build b/live-build/auto/build index 12cdb1a8..8d53a275 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -618,11 +618,7 @@ for FLAVOUR in $LB_LINUX_FLAVOURS; do fi case $FLAVOUR in allwinner|virtual|generic-hwe-*) - if [ "$ARCH" = "armhf" ]; then - FLAVOUR="generic-lpae" - else - FLAVOUR="generic" - fi + FLAVOUR="generic" ;; oem-*) FLAVOUR="oem" diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image index 3b356075..8e6e9726 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image +++ b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image @@ -3,8 +3,6 @@ base/disk-image.binary base/disk-image-ppc64el.binary provides livecd.ubuntu-cpc.ext4 provides livecd.ubuntu-cpc.initrd-generic -provides livecd.ubuntu-cpc.initrd-generic-lpae provides livecd.ubuntu-cpc.kernel-generic -provides livecd.ubuntu-cpc.kernel-generic-lpae provides livecd.ubuntu-cpc.manifest provides livecd.ubuntu-cpc.filelist diff --git a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi index 438930b7..2faa4aa1 100644 --- a/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi +++ b/live-build/ubuntu-cpc/hooks.d/base/series/disk-image-uefi @@ -1,8 +1,6 @@ base/disk-image-uefi.binary provides livecd.ubuntu-cpc.ext4 provides livecd.ubuntu-cpc.initrd-generic -provides livecd.ubuntu-cpc.initrd-generic-lpae provides livecd.ubuntu-cpc.kernel-generic -provides livecd.ubuntu-cpc.kernel-generic-lpae provides livecd.ubuntu-cpc.manifest provides livecd.ubuntu-cpc.filelist diff --git a/minimize-manual b/minimize-manual index 393ec2cb..eac75e95 100755 --- a/minimize-manual +++ b/minimize-manual @@ -7,10 +7,10 @@ set -e -chroot=$1 +chroot_directory=$1 -auto_packages=$(/usr/share/livecd-rootfs/auto-markable-pkgs $chroot) +auto_packages=$(/usr/share/livecd-rootfs/auto-markable-pkgs $chroot_directory) if [ -n "$auto_packages" ]; then - chroot chroot apt-mark auto $auto_packages + chroot $chroot_directory apt-mark auto $auto_packages fi -[ -z "$(/usr/share/livecd-rootfs/auto-markable-pkgs $chroot 2> /dev/null)" ] +[ -z "$(/usr/share/livecd-rootfs/auto-markable-pkgs $chroot_directory 2> /dev/null)" ]