ci: Strip yet more unnecessary things from the rootfs

We don't need to ship a Rust toolchain, drivers from Debian's version of
Mesa, etc. So stop doing it.

Signed-off-by: Daniel Stone <daniels@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31595>
This commit is contained in:
Daniel Stone 2024-10-10 15:43:54 -04:00 committed by Marge Bot
parent 9295de1396
commit 0ec961325b
2 changed files with 15 additions and 13 deletions

View file

@ -26,7 +26,7 @@ apt-get autoremove --yes || true
UNNEEDED_PACKAGES=(
apt libapt-pkg6.0
ncurses-bin ncurses-base libncursesw6 libncurses6
perl-base
perl-base libperl5.36 perl-modules-5.36
debconf libdebconfclient0
e2fsprogs e2fslibs libfdisk1
insserv
@ -40,14 +40,8 @@ UNNEEDED_PACKAGES=(
hostname
adduser
debian-archive-keyring
libegl1-mesa-dev # mesa group
libegl-mesa0
libgl1-mesa-dev
libgl1-mesa-dri
libglapi-mesa
libgles2-mesa-dev
libglx-mesa0
mesa-common-dev
"*mesa*"
intel-media-va-driver
gnupg2
software-properties-common
)
@ -91,6 +85,7 @@ directories=(
/var/lib/usbutils/usb.ids
/root/.pip # pip cache
/root/.cache
/root/.cargo
/etc/apt # configuration archives of apt and dpkg
/etc/dpkg
/var/* # drop non-ostree directories
@ -115,6 +110,13 @@ directories=(
/usr/lib/*/libnss_hesiod* # remove NSS support for nis, nisplus and hesiod
/usr/lib/*/libnss_nis*
/usr/lib/*/wine # don't need Wine's implementation, using Proton instead
/usr/local/bin/mold
/usr/local/bin/bindgen
/usr/local/bin/cargo*
/usr/local/bin/clippy*
/usr/local/bin/rust*
/usr/local/bin/rls
/usr/lib/*/dri
)
for directory in "${directories[@]}"; do

View file

@ -27,10 +27,10 @@ variables:
DEBIAN_ARM64_TEST_IMAGE_VK_PATH: "debian/arm64_test-vk"
DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
DEBIAN_TEST_ANDROID_TAG: "20241011-deqpr"
DEBIAN_TEST_GL_TAG: "20241016-vatkins"
DEBIAN_TEST_VK_TAG: "20241016-teetotal"
KERNEL_ROOTFS_TAG: "20241016-vatkins"
DEBIAN_TEST_ANDROID_TAG: "20241011-acetone"
DEBIAN_TEST_GL_TAG: "20241016-acetone"
DEBIAN_TEST_VK_TAG: "20241016-acetone"
KERNEL_ROOTFS_TAG: "20241016-acetone"
DEBIAN_PYUTILS_IMAGE: "debian/x86_64_pyutils"
DEBIAN_PYUTILS_TAG: "20241002-pyutils"