mirrors/monado
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/monado/monado.git synced 2024-12-28 18:46:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ci: Minor cleanup to install-cross.sh

Browse source
This commit is contained in:
Rylie Pavlik 2024-05-03 14:02:32 -05:00
parent 8062defa3c
commit 6cf8dfa4bf
1 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
.gitlab-ci/install-cross.sh
View file

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
# Copyright 2019-2020, Mesa contributors # Copyright 2019-2020, Mesa contributors
# Copyright 2020, Collabora, Ltd. # Copyright 2020-2024, Collabora, Ltd.
# SPDX-License-Identifier: MIT # SPDX-License-Identifier: MIT
# Based on https://gitlab.freedesktop.org/mesa/mesa/-/blob/master/.gitlab-ci/container/x86_build.sh # Based on https://gitlab.freedesktop.org/mesa/mesa/-/blob/2e100bd69b67cbb70b8a8e813ed866618a2252ca/.gitlab-ci/container/cross_build.sh
set -e set -e
set -o xtrace set -o xtrace
@ -21,26 +21,26 @@ for arch in $CROSS_ARCHITECTURES; do
# OpenCV and libuvc aren't on this list because # OpenCV and libuvc aren't on this list because
# they apparently can't be installed in both architectures at once # they apparently can't be installed in both architectures at once
apt-get install -y --no-install-recommends --no-remove \ apt-get install -y --no-install-recommends --no-remove \
crossbuild-essential-${arch} \ "crossbuild-essential-${arch}" \
libelf-dev:${arch} \ "libelf-dev:${arch}" \
libegl1-mesa-dev:${arch} \ "libegl1-mesa-dev:${arch}" \
libgl1-mesa-dev:${arch} \ "libgl1-mesa-dev:${arch}" \
libglvnd-dev:${arch} \ "libglvnd-dev:${arch}" \
libhidapi-dev:${arch} \ "libhidapi-dev:${arch}" \
libudev-dev:${arch} \ "libudev-dev:${arch}" \
libusb-1.0-0-dev:${arch} \ "libusb-1.0-0-dev:${arch}" \
libv4l-dev:${arch} \ "libv4l-dev:${arch}" \
libvulkan-dev:${arch} \ "libvulkan-dev:${arch}" \
libwayland-dev:${arch} \ "libwayland-dev:${arch}" \
libx11-dev:${arch} \ "libx11-dev:${arch}" \
libxcb-randr0-dev:${arch} \ "libxcb-randr0-dev:${arch}" \
libxrandr-dev:${arch} \ "libxrandr-dev:${arch}" \
libxxf86vm-dev:${arch} "libxxf86vm-dev:${arch}"
if [ "$arch" != "i386" ]; then if [ "$arch" != "i386" ]; then
mkdir /var/cache/apt/archives/${arch} mkdir "/var/cache/apt/archives/${arch}"
apt-get install -y --no-remove \ apt-get install -y --no-remove \
libstdc++6:${arch} "libstdc++6:${arch}"
fi fi
done done