Mesa (master): ci: do not build libdrm for vc4, reedreno and etnaviv

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 2f62a44df0f694791d7c364940841e8682faeefc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2f62a44df0f694791d7c364940841e8682faeefc

Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date:   Wed Sep  9 22:21:14 2020 +0200

ci: do not build libdrm for vc4, reedreno and etnaviv

They are using a in source tree version of the needed libdrm
functionality or are shipping all needed headers in the source tree.

Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6672>

---

 .gitlab-ci.yml             | 14 +++++++-------
 .gitlab-ci/build-libdrm.sh |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 649f0021a9c..2f7e5ced297 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -225,7 +225,7 @@ x86_build:
   extends:
     - .use-x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_build "2020-08-13-gold"
+    FDO_DISTRIBUTION_TAG: &x86_build "2020-09-10-libdrm"
 
 .use-x86_build:
   variables:
@@ -239,7 +239,7 @@ i386_build:
   extends:
     - .use-x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &i386_build "2020-08-13-gold"
+    FDO_DISTRIBUTION_TAG: &i386_build "2020-09-10-libdrm"
 
 .use-i386_build:
   variables:
@@ -253,7 +253,7 @@ ppc64el_build:
   extends:
     - .use-x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-08-13-gold"
+    FDO_DISTRIBUTION_TAG: &ppc64el_build "2020-09-10-libdrm"
 
 .use-ppc64el_build:
   variables:
@@ -267,7 +267,7 @@ s390x_build:
   extends:
     - .use-x86_build-base
   variables:
-    FDO_DISTRIBUTION_TAG: &s390x_build "2020-08-13-gold"
+    FDO_DISTRIBUTION_TAG: &s390x_build "2020-09-10-libdrm"
 
 .use-s390x_build:
   variables:
@@ -297,7 +297,7 @@ x86_test-base:
 x86_test-gl:
   extends: .use-x86_test-base
   variables:
-    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-09-03-deqp-version"
+    FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-09-10-libdrm"
 
 # Debian 10 based x86 test image for VK
 x86_test-vk:
@@ -325,7 +325,7 @@ arm_build:
     - .fdo.container-build at debian@arm64v8
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_build "2020-08-31-deqp-version"
+    FDO_DISTRIBUTION_TAG: &arm_build "2020-09-10-libdrm"
 
 .use-arm_build:
   variables:
@@ -340,7 +340,7 @@ arm_test-base:
     - .fdo.container-build at debian
     - .container
   variables:
-    FDO_DISTRIBUTION_TAG: &arm_test-base "2020-08-13-gold"
+    FDO_DISTRIBUTION_TAG: &arm_test-base "2020-09-10-libdrm"
 
 .use-arm_test-base:
   extends:
diff --git a/.gitlab-ci/build-libdrm.sh b/.gitlab-ci/build-libdrm.sh
index 1a57041f6fe..9484fc36d8d 100644
--- a/.gitlab-ci/build-libdrm.sh
+++ b/.gitlab-ci/build-libdrm.sh
@@ -7,7 +7,7 @@ export LIBDRM_VERSION=libdrm-2.4.102
 wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.xz
 tar -xvf $LIBDRM_VERSION.tar.xz && rm $LIBDRM_VERSION.tar.xz
 cd $LIBDRM_VERSION
-meson build -D vc4=true -D freedreno=true -D etnaviv=true $EXTRA_MESON_ARGS
+meson build -D vc4=false -D freedreno=false -D etnaviv=false $EXTRA_MESON_ARGS
 ninja -C build install
 cd ..
 rm -rf $LIBDRM_VERSION