From bc8e866b1dc1d47ec9980521d95abbf4b1430248 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Michel=20D=C3=A4nzer?= <mdaenzer@redhat.com>
Date: Mon, 22 Mar 2021 12:15:04 +0100
Subject: [PATCH] ci: Do not install armhf LLVM packages

LLVM support has been disabled in the meson-armhf job for some time, so
they were unused.

Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9833>
---
 .gitlab-ci.yml                      |  9 ++++-----
 .gitlab-ci/container/cross_build.sh | 10 +++-------
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ce22e84..698e9ff 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -330,7 +330,7 @@ i386_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &i386_build "2021-04-11-libdrm"
+    MESA_IMAGE_TAG: &i386_build "2021-04-13-armhf-no-llvm"
 
 .use-i386_build:
   extends:
@@ -347,7 +347,7 @@ ppc64el_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &ppc64el_build "2021-04-11-libdrm"
+    MESA_IMAGE_TAG: &ppc64el_build "2021-04-13-armhf-no-llvm"
 
 .use-ppc64el_build:
   extends:
@@ -364,7 +364,7 @@ s390x_build:
   extends:
     - .use-x86_build-base
   variables:
-    MESA_IMAGE_TAG: &s390x_build "2021-04-11-libdrm"
+    MESA_IMAGE_TAG: &s390x_build "2021-04-13-armhf-no-llvm"
 
 .use-s390x_build:
   extends:
@@ -427,7 +427,7 @@ arm_build:
     - .fdo.container-build@debian@arm64v8
     - .container
   variables:
-    MESA_IMAGE_TAG: &arm_build "2021-04-11-libdrm"
+    MESA_IMAGE_TAG: &arm_build "2021-04-13-armhf-no-llvm"
 
 .use-arm_build:
   extends:
@@ -818,7 +818,6 @@ meson-armhf:
     - .ci-deqp-artifacts
   variables:
     CROSS: armhf
-    LLVM_VERSION: "7"
     EXTRA_OPTION: >
       -D llvm=disabled
       -D valgrind=false
diff --git a/.gitlab-ci/container/cross_build.sh b/.gitlab-ci/container/cross_build.sh
index 5f6c523..c3831c8 100644
--- a/.gitlab-ci/container/cross_build.sh
+++ b/.gitlab-ci/container/cross_build.sh
@@ -38,15 +38,11 @@ apt-get install -y --no-remove \
         libxxf86vm-dev:$arch \
         wget
 
-if [[ $arch == "armhf" ]]; then
-        LLVM=llvm-7-dev
-else
-        LLVM=llvm-8-dev
+if [[ $arch != "armhf" ]]; then
+    apt-get install -y --no-remove -t buster-backports \
+            llvm-8-dev:$arch
 fi
 
-apt-get install -y --no-remove -t buster-backports \
-        $LLVM:$arch
-
 . .gitlab-ci/container/create-cross-file.sh $arch
 
 
-- 
2.7.4