From f8bd628c8397f4e0b00479624945f92501fd53b3 Mon Sep 17 00:00:00 2001 From: Philip Roche Date: Thu, 31 Aug 2023 18:26:42 +0100 Subject: [PATCH] fix: Sort filelists creating when building ubuntu-cpc images (LP: #2033677) The image filelists created during ubuntu-cpc project image builds were not sorted. Soring the filelists makes it easier to compare the filelists without needing to sort first. --- debian/changelog | 6 ++++++ live-build/functions | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index d5fb11e2..e758dae4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +livecd-rootfs (23.10.30) mantic; urgency=medium + + * fix: Sort filelists creating when building ubuntu-cpc images (LP: #2033677) + + -- Philip Roche Thu, 31 Aug 2023 18:20:23 +0100 + livecd-rootfs (23.10.29) mantic; urgency=medium * canary: switch to use the live task, try to use KERNEL_FLAVOURS instead diff --git a/live-build/functions b/live-build/functions index 4a97e9c2..5a3a11e0 100644 --- a/live-build/functions +++ b/live-build/functions @@ -47,7 +47,7 @@ create_manifest() { if [ "$PROJECT" = ubuntu-cpc ]; then echo "create_manifest creating file listing." local target_filelist=${2%.manifest}.filelist - (cd "${chroot_root}" && find -xdev) > "${target_filelist}" + (cd "${chroot_root}" && find -xdev) | sort > "${target_filelist}" fi echo "create_manifest finished" }