From 2cf3730f4f56257729a0002a7a3b48954018e906 Mon Sep 17 00:00:00 2001 From: Daniel Stone Date: Mon, 21 Jun 2021 23:49:32 +0100 Subject: [PATCH] CI: Consolidate kernel/Mesa dependency installation This makes it easier to split our scripts into OS-independent and OS-dependent sections. Signed-off-by: Daniel Stone --- .gitlab-ci/debian-install.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh index bcdb9e9a..bf0edc2c 100644 --- a/.gitlab-ci/debian-install.sh +++ b/.gitlab-ci/debian-install.sh @@ -98,7 +98,8 @@ apt-get -y --no-install-recommends install \ qemu-system \ sysvinit-core \ xwayland \ - $MESA_RUNTIME_PKGS + $MESA_RUNTIME_PKGS \ + $LINUX_DEV_PKGS \ apt-get -y --no-install-recommends -t buster-backports install \ freerdp2-dev @@ -120,7 +121,6 @@ pip3 install sphinx_rtd_theme==0.4.3 --user # Build a Linux kernel for use in testing. We enable the VKMS module so we can # predictably test the DRM backend in the absence of real hardware. We lock the # version here so we see predictable results. -apt-get -y --no-install-recommends install $LINUX_DEV_PKGS git clone --depth=1 --branch=drm-next-2020-06-11-1 https://anongit.freedesktop.org/git/drm/drm.git linux cd linux make x86_64_defconfig @@ -219,5 +219,4 @@ ninja ${NINJAFLAGS} -C build install cd .. rm -rf seatd -apt-get -y --autoremove purge $LINUX_DEV_PKGS -apt-get -y --autoremove purge $MESA_DEV_PKGS +apt-get -y --autoremove purge $LINUX_DEV_PKGS $MESA_DEV_PKGS