gitlab-ci: Don't build libdrm for ARM

The Debian packages work fine. Saves a little bit of time and disk
space.

Reviewed-by: Eric Anholt <eric@anholt.net>

diff --git a/.gitlab-ci/debian-arm64-install.sh b/.gitlab-ci/debian-arm64-install.sh
index 95647fd64eecea474264dc7c7887d650c7a9e596..3f068f6dddf32a3341613e92b6011b284f18cd2a 100644 (file)
--- a/.gitlab-ci/debian-arm64-install.sh
+++ b/.gitlab-ci/debian-arm64-install.sh
@@ -17,6 +17,7 @@ apt-get -y install \
        flex \
        g++ \
        gettext \
+       libdrm-dev \
        libdrm-dev:armhf \
        libelf-dev \
        libelf-dev:armhf \
@@ -41,17 +42,6 @@ sed -i "s|/usr/bin/\([^-]*\)-linux-gnu\([^-]*\)-g|/usr/lib/ccache/\\1-linux-gnu\
 # Don't need wrapper for armhf executables
 sed -i -e '/\[properties\]/a\' -e "needs_exe_wrapper = False" "$cross_file"
 
-export             LIBDRM_VERSION=libdrm-2.4.99
-
-############### Build libdrm
-
-wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
-tar -xvf $LIBDRM_VERSION.tar.bz2 && rm $LIBDRM_VERSION.tar.bz2
-cd $LIBDRM_VERSION; meson build/ -Detnaviv=true; ninja -C build/ install; cd ..
-rm -rf $LIBDRM_VERSION
-
-############### Uninstall the build software
-
 apt-get purge -y \
         wget
 

diff --git a/.gitlab-ci/debian-arm64-test-install.sh b/.gitlab-ci/debian-arm64-test-install.sh
index bc7233e4bdc8f71e096bf7fe4ec2514a3171060e..e80ba60f7cf00005fd5475c8b2ab5ff0c8844a26 100644 (file)
--- a/.gitlab-ci/debian-arm64-test-install.sh
+++ b/.gitlab-ci/debian-arm64-test-install.sh
@@ -15,6 +15,7 @@ apt-get -y install \
        gcc \
        git \
        libc6-dev \
+       libdrm-nouveau2 \
        libexpat1 \
        libgbm-dev \
        libgbm-dev \
@@ -29,15 +30,6 @@ apt-get -y install \
        wget \
        zlib1g
 
-export             LIBDRM_VERSION=libdrm-2.4.99
-
-############### Build libdrm
-
-wget https://dri.freedesktop.org/libdrm/$LIBDRM_VERSION.tar.bz2
-tar -xvf $LIBDRM_VERSION.tar.bz2 && rm $LIBDRM_VERSION.tar.bz2
-cd $LIBDRM_VERSION; meson build/ -Detnaviv=true; ninja -C build/ install; cd ..
-rm -rf $LIBDRM_VERSION
-
 ############### Build dEQP
 
 git config --global user.email "mesa@example.com"