diff --git a/debian/changelog b/debian/changelog index 7be12301..b015264f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.664.46) UNRELEASED; urgency=medium + + * Terrible hack workaround for clearing out the non-offline apt cache for + desktop related images. Backported from jammy. + + -- Ɓukasz 'sil2100' Zemczak Thu, 16 Mar 2023 14:03:18 +0100 + livecd-rootfs (2.664.45) focal; urgency=medium [ Samir Akarioh ] diff --git a/live-build/auto/build b/live-build/auto/build index e43165ee..96a4a9c1 100755 --- a/live-build/auto/build +++ b/live-build/auto/build @@ -478,6 +478,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|ubuntustudio) + rm -f chroot/var/lib/apt/lists/*ubuntu.com*_Packages + ;; + esac + if [ -n "${PASSES}" ]; then PATH="config/:$PATH" lb binary_layered "$@" else