From 5b99af28d06f7e85679056e505dc2e83f4736146 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20=27sil2100=27=20Zemczak?= Date: Wed, 22 Feb 2023 23:59:40 +0100 Subject: [PATCH] Terrible workaround --- debian/changelog | 7 +++++++ live-build/auto/build | 12 ++++++++++++ 2 files changed, 19 insertions(+) diff --git a/debian/changelog b/debian/changelog index 0b2458be..67f4c79c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +livecd-rootfs (2.765.18) UNRELEASED; urgency=medium + + * Terrible hack workaround for clearing out the non-offline apt cache for + desktop related images. + + -- Łukasz 'sil2100' Zemczak Wed, 22 Feb 2023 23:57:38 +0100 + livecd-rootfs (2.765.17) jammy; urgency=medium * Do not offer the hwe kernel for RISC-V server-live images (LP: #2007863). diff --git a/live-build/auto/build b/live-build/auto/build index 4e385a50..ae2f0b4f 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 /var/lib/apt/lists/*ubuntu.com*_Packages + ;; + esac + if [ -n "${PASSES}" ]; then PATH="config/:$PATH" lb binary_layered "$@" else