ci: add more dependencies to install-cross.sh, and bump CI image

Part-of: <https://gitlab.freedesktop.org/monado/monado/-/merge_requests/2272>
This commit is contained in:
Simon Zeni 2024-07-04 13:17:13 -04:00 committed by Rylie Pavlik
parent 748d6bc5e7
commit 66a5b36bd5
3 changed files with 10 additions and 3 deletions

View file

@ -126,7 +126,7 @@ win:container_prep:
.monado.variables.debian:bookworm:
variables:
FDO_DISTRIBUTION_VERSION: "bookworm"
FDO_DISTRIBUTION_TAG: "2024-07-18"
FDO_DISTRIBUTION_TAG: "2024-08-16"
# Variables for build and usage of Debian bullseye image
.monado.variables.debian:bullseye:

View file

@ -73,7 +73,7 @@ distributions:
# This image does some extra work.
- codename: bookworm
script: i386_and_proclamation_container_prep.sh
tag: "2024-07-18"
tag: "2024-08-16"
deb_version_suffix: bpo12
packages:
<<: *default_debian_packages

View file

@ -22,21 +22,28 @@ for arch in $CROSS_ARCHITECTURES; do
# they apparently can't be installed in both architectures at once
apt-get install -y --no-install-recommends --no-remove \
"crossbuild-essential-${arch}" \
"libelf-dev:${arch}" \
"libavcodec-dev:${arch}" \
"libbsd-dev:${arch}" \
"libcjson-dev:${arch}" \
"libegl1-mesa-dev:${arch}" \
"libeigen3-dev:${arch}" \
"libelf-dev:${arch}" \
"libgl1-mesa-dev:${arch}" \
"libglvnd-dev:${arch}" \
"libhidapi-dev:${arch}" \
"libsdl2-dev:${arch}" \
"libudev-dev:${arch}" \
"libusb-1.0-0-dev:${arch}" \
"libv4l-dev:${arch}" \
"libvulkan-dev:${arch}" \
"libwayland-dev:${arch}" \
"libx11-dev:${arch}" \
"libx11-xcb-dev:${arch}" \
"libxcb-randr0-dev:${arch}" \
"libxrandr-dev:${arch}" \
"libxxf86vm-dev:${arch}"
if [ "$arch" != "i386" ]; then
mkdir "/var/cache/apt/archives/${arch}"
apt-get install -y --no-remove \