diff --git a/debian/changelog b/debian/changelog index dcbd0673..32e83b89 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,9 +6,12 @@ livecd-rootfs (2.801) UNRELEASED; urgency=medium [ Ɓukasz 'sil2100' Zemczak ] * Add ubuntucinnamon to the supported flavours. + * Terrible hack workaround for clearing out the non-offline apt cache + for desktop related images. [ Dimitri John Ledkov ] - * ubuntu-cpc: set default ext4 mount option commit=30 (LP: #2006511) + * ubuntu-cpc: set default ext4 mount option commit=30 (LP: #2006511). + * Cherry-pick jammy point release fixes. -- Dimitri John Ledkov Fri, 24 Feb 2023 12:01:52 +0000 diff --git a/live-build/auto/build b/live-build/auto/build index 4a0dd317..7b984d92 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -482,6 +482,18 @@ EOF clean_debian_chroot fi + # XXX: Terrible last-minute hack to work-around issue LP: #2008082 ! + # This basically needs to be done better, we simply need to make sure + # that we don't update the cache after lb cleans up. Since identifying + # that might take a moment, for now, for flavors that are generally + # affected by this, we manually clear out the archive-related Packages + # files in the cache. + case $PROJECT in + ubuntu|xubuntu|kubuntu|ubuntu-budgie|ubuntukylin|ubuntu-mate) + rm -f chroot/var/lib/apt/lists/*ubuntu.com*_Packages + ;; + esac + if [ -n "${PASSES}" ]; then PATH="config/:$PATH" lb binary_layered "$@" else