diff options
| author | Eric Anholt <[email protected]> | 2020-02-24 10:31:33 -0800 |
|---|---|---|
| committer | Marge Bot <[email protected]> | 2020-04-13 21:46:40 +0000 |
| commit | 9d50c53e474cede8d42641fa588132a539204e1d (patch) | |
| tree | ec2116249fd70cbae6f63bb0a67955b7e3ca389b /.gitlab-ci | |
| parent | 8980c5800074a96371dde5694a46aeab4c82937e (diff) | |
ci: Remove LLVM from ARM test drivers.
The LLVM libraries were a significant fraction of the entire payload
(55M/250M uncompressed) into the initramfs of the test boards, but
LLVM is only used for the draw module used in select/feedback (which
isn't even tested in CI on ARM yet).
Assume that llvmpipe draw is safe enough for ARM given the coverage on
x86, and disable LLVM for these jobs.
Reviewed-by: Tomeu Vizoso <[email protected]>
(cherry picked from commit 257415863b8431214f9eefa47df910053007c053)
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4462>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/create-rootfs.sh | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/.gitlab-ci/create-rootfs.sh b/.gitlab-ci/create-rootfs.sh index 810924061fb..43bc0564514 100644 --- a/.gitlab-ci/create-rootfs.sh +++ b/.gitlab-ci/create-rootfs.sh @@ -2,13 +2,6 @@ set -ex -LLVM=libllvm8 - -# LLVMPipe on armhf is broken with LLVM 8 -if [ `dpkg --print-architecture` = "armhf" ]; then - LLVM=libllvm7 -fi - apt-get -y install --no-install-recommends \ initramfs-tools \ libpng16-16 \ @@ -16,8 +9,7 @@ apt-get -y install --no-install-recommends \ libsensors5 \ libexpat1 \ libdrm2 \ - libdrm-nouveau2 \ - $LLVM + libdrm-nouveau2 passwd root -d chsh -s /bin/sh ln -s /bin/sh /init |