From 9a8823145889bc009accc2dbb2f08eceb2c4a0ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Corentin=20No=C3=ABl?= <corentin.noel@collabora.com>
Date: Wed, 6 Apr 2022 15:57:40 +0200
Subject: [PATCH] ci: Only apply patches with the build-skqp prefix
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Allows to ship patches for other components too.

Signed-off-by: Corentin Noël <corentin.noel@collabora.com>
Reviewed-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15772>
---
 .gitlab-ci/container/build-skqp.sh | 2 +-
 .gitlab-ci/image-tags.yml          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci/container/build-skqp.sh b/.gitlab-ci/container/build-skqp.sh
index dd31c3f7f3c..af95eba327a 100755
--- a/.gitlab-ci/container/build-skqp.sh
+++ b/.gitlab-ci/container/build-skqp.sh
@@ -64,7 +64,7 @@ download_skia_source
 pushd "${SKIA_DIR}"
 
 # Apply all skqp patches for Mesa CI
-cat "${SKQP_PATCH_DIR}"/*.patch |
+cat "${SKQP_PATCH_DIR}"/build-skqp_*.patch |
     patch -p1
 
 # Fetch some needed build tools needed to build skia/skqp.
diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index dc967718aef..f7b000f457a 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -12,7 +12,7 @@ variables:
    DEBIAN_X86_TEST_VK_TAG: "2022-04-05-deqp-runner"
 
    FEDORA_X86_BUILD_TAG: "2022-03-18-spirv-tools-5"
-   KERNEL_ROOTFS_TAG: "2022-04-05-deqp-runner"
+   KERNEL_ROOTFS_TAG: "2022-04-07-prefix-skqp"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
    WINDOWS_X64_BUILD_TAG: "2022-20-02-base_split"