ci/crosvm: install libelogind0 and sysvinit-core for poweroff functionality

Signed-off-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21977>

diff --git a/.gitlab-ci/container/debian/x86_test-gl.sh b/.gitlab-ci/container/debian/x86_test-gl.sh
index 0229239..a5de1b3 100644 (file)
--- a/.gitlab-ci/container/debian/x86_test-gl.sh
+++ b/.gitlab-ci/container/debian/x86_test-gl.sh
@@ -7,6 +7,8 @@ set -o xtrace
 export DEBIAN_FRONTEND=noninteractive
 export LLVM_VERSION="${LLVM_VERSION:=15}"
 
+apt-get install -y libelogind0  # this interfere with systemd deps, install separately
+
 # Ephemeral packages (installed for this script and removed again at the end)
 STABLE_EPHEMERAL=" \
       bzip2 \
@@ -59,6 +61,7 @@ apt-get install -y --no-remove \
       python3-renderdoc \
       python3-simplejson \
       spirv-tools \
+      sysvinit-core \
       weston
 
 

diff --git a/.gitlab-ci/container/debian/x86_test-vk.sh b/.gitlab-ci/container/debian/x86_test-vk.sh
index 0d8d927..3113a63 100644 (file)
--- a/.gitlab-ci/container/debian/x86_test-vk.sh
+++ b/.gitlab-ci/container/debian/x86_test-vk.sh
@@ -8,6 +8,8 @@ set -o xtrace
 
 export DEBIAN_FRONTEND=noninteractive
 
+apt-get install -y libelogind0  # this interfere with systemd deps, install separately
+
 # Ephemeral packages (installed for this script and removed again at the end)
 STABLE_EPHEMERAL=" \
       ccache \
@@ -60,6 +62,7 @@ apt-get install -y --no-remove --no-install-recommends \
       pciutils \
       python3-lxml \
       python3-simplejson \
+      sysvinit-core \
       xinit \
       xserver-xorg-video-amdgpu \
       xserver-xorg-video-ati