summaryrefslogtreecommitdiff
path: root/.gitlab-ci
diff options
context:
space:
mode:
authorMichel Dänzer <mdaenzer@redhat.com>2019-11-06 17:05:56 +0100
committerMichel Dänzer <michel@daenzer.net>2019-11-12 10:16:08 +0100
commit4b25b5885b63a77b4f07be5c1a4307b41d8bc594 (patch)
tree20835d769c53b5efef8fd95425c4f2b195e40e8b /.gitlab-ci
parentdf26e18b9ffc77d6743363c757306f4f1b3f8084 (diff)
gitlab-ci: Sort packages in debian-install.sh
And remove duplicates. Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to '.gitlab-ci')
-rw-r--r--.gitlab-ci/debian-install.sh98
1 files changed, 48 insertions, 50 deletions
diff --git a/.gitlab-ci/debian-install.sh b/.gitlab-ci/debian-install.sh
index b51748107a0..f329648ee2d 100644
--- a/.gitlab-ci/debian-install.sh
+++ b/.gitlab-ci/debian-install.sh
@@ -12,8 +12,8 @@ done
apt-get install -y \
ca-certificates \
- wget \
- unzip
+ unzip \
+ wget
sed -i -e 's/http:\/\/deb/https:\/\/deb/g' /etc/apt/sources.list
echo 'deb https://deb.debian.org/debian buster-backports main' >/etc/apt/sources.list.d/backports.list
@@ -30,68 +30,66 @@ EOF
apt-get dist-upgrade -y
apt-get install -y --no-remove \
- llvm-6.0-dev \
- libclang-6.0-dev \
- llvm-7-dev \
- libclang-7-dev \
- llvm-8-dev \
- libclang-8-dev \
- g++ \
- clang-8 \
- git \
+ autoconf \
+ automake \
+ autotools-dev \
+ bison \
bzip2 \
- zlib1g-dev \
- pkg-config \
- libxrender-dev \
- libxdamage-dev \
- libxxf86vm-dev \
+ clang-8 \
+ cmake \
+ flex \
+ g++ \
gcc \
+ gettext \
git \
- libepoxy-dev \
- libegl1-mesa-dev \
- libgbm-dev \
+ libclang-6.0-dev \
+ libclang-7-dev \
+ libclang-8-dev \
libclc-dev \
- libxvmc-dev \
- libomxil-bellagio-dev \
- xz-utils \
- libexpat1-dev \
- libx11-xcb-dev \
+ libegl1-mesa-dev \
libelf-dev \
- libunwind-dev \
- autoconf \
- automake \
- autotools-dev \
- libtool \
- libxext-dev \
- libx11-dev \
- x11proto-gl-dev \
- libgtk-3-dev \
- libpng-dev \
+ libepoxy-dev \
+ libexpat1-dev \
libgbm-dev \
libgles2-mesa-dev \
+ libgtk-3-dev \
+ libomxil-bellagio-dev \
+ libpng-dev \
+ libtool \
+ libunwind-dev \
libvulkan-dev \
+ libx11-dev \
+ libx11-xcb-dev \
+ libxdamage-dev \
+ libxext-dev \
+ libxrender-dev \
+ libxvmc-dev \
+ libxxf86vm-dev \
+ llvm-6.0-dev \
+ llvm-7-dev \
+ llvm-8-dev \
+ meson \
+ pkg-config \
python-mako \
python3-mako \
- bison \
- flex \
- gettext \
- cmake \
- meson \
- scons
+ scons \
+ x11proto-gl-dev \
+ xz-utils \
+ zlib1g-dev
# Cross-build Mesa deps
for arch in $CROSS_ARCHITECTURES; do
apt-get install -y --no-remove \
+ crossbuild-essential-${arch} \
libdrm-dev:${arch} \
- libexpat1-dev:${arch} \
libelf-dev:${arch} \
- crossbuild-essential-${arch}
+ libexpat1-dev:${arch}
done
# for 64bit windows cross-builds
apt-get install -y --no-remove \
- mingw-w64 \
libz-mingw-w64-dev \
+ mingw-w64 \
wine \
wine32 \
wine64
@@ -251,16 +249,16 @@ done
############### Uninstall the build software
apt-get purge -y \
- wget \
- unzip \
- cmake \
- git \
autoconf \
automake \
autotools-dev \
- libtool \
- x11proto-gl-dev \
+ cmake \
+ git \
+ libgbm-dev \
libgles2-mesa-dev \
- libgbm-dev
+ libtool \
+ unzip \
+ wget \
+ x11proto-gl-dev
apt-get autoremove -y --purge