From dd79695b3b0dba002670d4b6eab5c60867e85f12 Mon Sep 17 00:00:00 2001
From: David Heidelberg <david.heidelberg@collabora.com>
Date: Thu, 4 Aug 2022 16:02:35 +0200
Subject: [PATCH] ci/lava: prepare wineprefix for GL and DXVK

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17938>
---
 .gitlab-ci/container/lava_build.sh | 9 +++++++++
 .gitlab-ci/image-tags.yml          | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/container/lava_build.sh b/.gitlab-ci/container/lava_build.sh
index 68370dbadc4..426a11bbc76 100755
--- a/.gitlab-ci/container/lava_build.sh
+++ b/.gitlab-ci/container/lava_build.sh
@@ -135,6 +135,15 @@ if [[ "$DEBIAN_ARCH" = "armhf" ]]; then
                        libxkbcommon-dev:armhf
 fi
 
+mkdir -p "/lava-files/rootfs-${DEBIAN_ARCH}"
+
+############### Setuping
+if [ "$DEBIAN_ARCH" = "amd64" ]; then
+  . .gitlab-ci/container/setup-wine.sh "/dxvk-wine64"
+  . .gitlab-ci/container/install-wine-dxvk.sh
+  mv /dxvk-wine64 "/lava-files/rootfs-${DEBIAN_ARCH}/"
+fi
+
 ############### Installing
 . .gitlab-ci/container/install-wine-apitrace.sh
 mkdir -p "/lava-files/rootfs-${DEBIAN_ARCH}/apitrace-msvc-win64"
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index 9fe5c678e24..746e7a1e98a 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -15,7 +15,7 @@ variables:
    DEBIAN_X86_TEST_VK_TAG: "2022-09-14-add-jq"
 
    FEDORA_X86_BUILD_TAG: "2022-08-25-shellcheck"
-   KERNEL_ROOTFS_TAG: "2022-09-19-kernel"
+   KERNEL_ROOTFS_TAG: "2022-09-20-wine-lava"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
    WINDOWS_X64_VS_TAG: "2022-08-17-bump"