diff options
| author | Michel Dänzer <[email protected]> | 2019-11-05 16:24:35 +0100 |
|---|---|---|
| committer | Michel Dänzer <[email protected]> | 2019-11-06 13:10:07 +0100 |
| commit | e0fff37f70d98338138150d5a5c43d696bc99efc (patch) | |
| tree | 0dc0b8540d508bbd515743e2cb5314e81c88600f /.gitlab-ci | |
| parent | b4d3ae22697ec97c4ffb017aac8eeed4aad7fb74 (diff) | |
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 <[email protected]>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/debian-arm64-install.sh | 12 | ||||
| -rw-r--r-- | .gitlab-ci/debian-arm64-test-install.sh | 10 |
2 files changed, 2 insertions, 20 deletions
diff --git a/.gitlab-ci/debian-arm64-install.sh b/.gitlab-ci/debian-arm64-install.sh index 95647fd64ee..3f068f6dddf 100644 --- 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 bc7233e4bdc..e80ba60f7cf 100644 --- 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 "[email protected]" |