From 03a26ae3d99f76c3975903c9c4ef8280167cec42 Mon Sep 17 00:00:00 2001 From: Emma Anholt Date: Wed, 4 Jan 2023 14:53:48 -0800 Subject: [PATCH] ci: Fix VK driver setup for HWCI_START_*. Review feedback requested a change that was incorrect, causing Xorg to start to fail, but I forgot to retest the manual -full jobs that relied on it. Fixes: 99a6f2a1864f ("ci: Set the path to the VK drivers during HWCI_START_XORG/WESTON.") Part-of: --- .gitlab-ci/common/init-stage2.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/common/init-stage2.sh b/.gitlab-ci/common/init-stage2.sh index beb86f5f12e..8e518c5b1a5 100755 --- a/.gitlab-ci/common/init-stage2.sh +++ b/.gitlab-ci/common/init-stage2.sh @@ -128,7 +128,7 @@ BACKGROUND_PIDS="$! $BACKGROUND_PIDS" if [ -n "$HWCI_START_XORG" ]; then echo "touch /xorg-started; sleep 100000" > /xorg-script env \ - VK_ICD_FILENAMES=/install/share/vulkan/icd.d/$(VK_DRIVER)_icd.`uname -m`.json \ + VK_ICD_FILENAMES=/install/share/vulkan/icd.d/${VK_DRIVER}_icd.`uname -m`.json \ xinit /bin/sh /xorg-script -- /usr/bin/Xorg -noreset -s 0 -dpms -logfile /Xorg.0.log & BACKGROUND_PIDS="$! $BACKGROUND_PIDS" @@ -147,7 +147,7 @@ if [ -n "$HWCI_START_WESTON" ]; then mkdir -p $XDG_RUNTIME_DIR env \ - VK_ICD_FILENAMES=/install/share/vulkan/icd.d/$(VK_DRIVER)_icd.`uname -m`.json \ + VK_ICD_FILENAMES=/install/share/vulkan/icd.d/${VK_DRIVER}_icd.`uname -m`.json \ weston -Bheadless-backend.so --use-gl -Swayland-0 & export WAYLAND_DISPLAY=wayland-0 sleep 1