KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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@gmail.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6672>
This commit is contained in:
Christian Gmeiner 2020-09-09 22:21:14 +02:00 committed by Marge Bot
parent 52becd39a5
commit 2f62a44df0
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
.gitlab-ci.yml
View File

@ -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@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@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:

2
.gitlab-ci/build-libdrm.sh
View File

@ -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