ci: add libdrm to the x86_test-vk container
Fixes: 5d0ba8b1834 (ci: Split building of libdrm to its own script)
Signed-off-by: Andres Gomez <agomez@igalia.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9102>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index eaf5617..4d2c854 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -413,7 +413,7 @@
x86_test-vk:
extends: .use-x86_test-base
variables:
- MESA_IMAGE_TAG: &x86_test-vk "2021-02-17-gfxreconstruct-master"
+ MESA_IMAGE_TAG: &x86_test-vk "2021-02-18-add-libdrm"
# Debian 10 based ARM build image
arm_build:
diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh
index 6c1923e..7d41fa7 100644
--- a/.gitlab-ci/container/x86_test-vk.sh
+++ b/.gitlab-ci/container/x86_test-vk.sh
@@ -13,6 +13,7 @@
libgbm-dev \
libgles2-mesa-dev \
liblz4-dev \
+ libpciaccess-dev \
libpng-dev \
libvulkan-dev \
libwaffle-dev \
@@ -28,6 +29,7 @@
pkg-config \
python3-distutils \
wget \
+ xz-utils \
"
apt-get install -y --no-remove \
@@ -127,6 +129,10 @@
. .gitlab-ci/container/build-gfxreconstruct.sh
+############### Build libdrm
+
+. .gitlab-ci/container/build-libdrm.sh
+
############### Uninstall the build software
ccache --show-stats