OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Remove syslogd

Browse Source 
Crosvm doesn't need it any more.

Signed-off-by: Tomeu Vizoso <tomeu.vizoso@collabora.com>
Reviewed-by: Corentin Noël <corentin.noel@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12828>
This commit is contained in:
Tomeu Vizoso
2021-11-17 08:33:46 +01:00
committed by Marge Bot
parent d542e978e9
commit 4bfcbe3f69
3 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@@ -410,7 +410,7 @@ debian/x86_test-gl:
variables: variables:
FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh'
KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.15-for-mesa-ci-540a4af22d71/linux-v5.15-for-mesa-ci-540a4af22d71.tar.bz2" KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.15-for-mesa-ci-540a4af22d71/linux-v5.15-for-mesa-ci-540a4af22d71.tar.bz2"
MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-02-deqp" MESA_IMAGE_TAG: &debian-x86_test-gl "2021-11-17-syslogd-removal"
# Debian 11 based x86 test image for VK # Debian 11 based x86 test image for VK
debian/x86_test-vk: debian/x86_test-vk:

1
.gitlab-ci/container/debian/x86_test-gl.sh
View File

@@ -53,7 +53,6 @@ STABLE_EPHEMERAL=" \
apt-get install -y --no-remove \ apt-get install -y --no-remove \
$STABLE_EPHEMERAL \ $STABLE_EPHEMERAL \
clinfo \ clinfo \
inetutils-syslogd \
iptables \ iptables \
libclang-common-11-dev \ libclang-common-11-dev \
libclang-cpp11 \ libclang-cpp11 \

3
.gitlab-ci/crosvm-runner.sh
View File

@@ -27,9 +27,6 @@ unset XDG_RUNTIME_DIR
/usr/sbin/iptables-legacy -t nat -A POSTROUTING -o eth0 -j MASQUERADE /usr/sbin/iptables-legacy -t nat -A POSTROUTING -o eth0 -j MASQUERADE
echo 1 > /proc/sys/net/ipv4/ip_forward echo 1 > /proc/sys/net/ipv4/ip_forward
# Crosvm wants this
syslogd > /dev/null
# We aren't testing LLVMPipe here, so we don't need to validate NIR on the host # We aren't testing LLVMPipe here, so we don't need to validate NIR on the host
export NIR_VALIDATE=0 export NIR_VALIDATE=0