From 6aec920bbe56fdfefe2354cef0f73fb6351ff229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin.noel@collabora.com>
Date: Wed, 3 Jul 2024 14:52:24 +0200
Subject: [PATCH] ci: Make sure to install libraries in the right directory on
 debian
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Meson is using dpkg-architecture to guess the right triplet for the lib directory
make sure to have it installed (from dpkg-dev) to always use the right directory.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/30015>
---
 .gitlab-ci/container/debian/test-base.sh         | 1 +
 .gitlab-ci/container/debian/test-gl.sh           | 1 +
 .gitlab-ci/container/debian/test-vk.sh           | 1 +
 .gitlab-ci/container/debian/x86_64_build-base.sh | 1 +
 .gitlab-ci/image-tags.yml                        | 8 ++++----
 5 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/container/debian/test-base.sh b/.gitlab-ci/container/debian/test-base.sh
index ef42fa05f2f..09816ad0720 100644
--- a/.gitlab-ci/container/debian/test-base.sh
+++ b/.gitlab-ci/container/debian/test-base.sh
@@ -28,6 +28,7 @@ EPHEMERAL=(
     ccache
     cmake
     "clang-${LLVM_VERSION}"
+    dpkg-dev
     flex
     glslang-tools
     g++
diff --git a/.gitlab-ci/container/debian/test-gl.sh b/.gitlab-ci/container/debian/test-gl.sh
index a6252e1e5be..996859e72da 100644
--- a/.gitlab-ci/container/debian/test-gl.sh
+++ b/.gitlab-ci/container/debian/test-gl.sh
@@ -15,6 +15,7 @@ EPHEMERAL=(
     ccache
     "clang-${LLVM_VERSION}"
     cmake
+    dpkg-dev
     g++
     glslang-tools
     libasound2-dev
diff --git a/.gitlab-ci/container/debian/test-vk.sh b/.gitlab-ci/container/debian/test-vk.sh
index 1bd737f7c0a..9f569b10134 100644
--- a/.gitlab-ci/container/debian/test-vk.sh
+++ b/.gitlab-ci/container/debian/test-vk.sh
@@ -14,6 +14,7 @@ apt-get install -y libelogind0  # this interfere with systemd deps, install sepa
 EPHEMERAL=(
     ccache
     cmake
+    dpkg-dev
     g++
     glslang-tools
     libexpat1-dev
diff --git a/.gitlab-ci/container/debian/x86_64_build-base.sh b/.gitlab-ci/container/debian/x86_64_build-base.sh
index e41d3b3081d..65713695117 100644
--- a/.gitlab-ci/container/debian/x86_64_build-base.sh
+++ b/.gitlab-ci/container/debian/x86_64_build-base.sh
@@ -28,6 +28,7 @@ DEPS=(
     "clang-${LLVM_VERSION}"
     "clang-format-${LLVM_VERSION}"
     dpkg-cross
+    dpkg-dev
     findutils
     flex
     flatbuffers-compiler
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 25942604014..bee536329cc 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -13,10 +13,10 @@
 
 variables:
    DEBIAN_X86_64_BUILD_BASE_IMAGE: "debian/x86_64_build-base"
-   DEBIAN_BASE_TAG: "20240612-mold"
+   DEBIAN_BASE_TAG: "20240704-libdir"
 
    DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
-   DEBIAN_BUILD_TAG: "20240612-mold"
+   DEBIAN_BUILD_TAG: "20240704-libdir"
 
    DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
    DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base"
@@ -28,8 +28,8 @@ variables:
    DEBIAN_X86_64_TEST_ANDROID_IMAGE_PATH: "debian/x86_64_test-android"
 
    DEBIAN_TEST_ANDROID_TAG: "20240423-deqp"
-   DEBIAN_TEST_GL_TAG: "20240703-vvl"
-   DEBIAN_TEST_VK_TAG: "20240703-vkd3d"
+   DEBIAN_TEST_GL_TAG: "20240704-libdir"
+   DEBIAN_TEST_VK_TAG: "20240704-libdir"
    KERNEL_ROOTFS_TAG: "20240703-vvl"
 
    ALPINE_X86_64_BUILD_TAG: "20240620-sphinx"