fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 16:08:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ci: Install sysvinit-core without --no-remove

Browse source 
As it conflicts now with some packages already installed but not
necessary, such as:

libpam-systemd packagekit packagekit-tools policykit-1 systemd-sysv

Reviewed-by: David Heidelberg <david.heidelberg@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18467>
This commit is contained in:
Tomeu Vizoso 2022-09-07 13:24:33 +02:00 • committed by Marge Bot
parent 86e2078be7
commit 7dc8a78001
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.gitlab-ci/container/debian/x86_test-base.sh
View file

@ -54,6 +54,9 @@ add-apt-repository "deb https://apt.llvm.org/bullseye/ llvm-toolchain-bullseye-1
apt-get update
apt-get dist-upgrade -y
apt-get install -y \
sysvinit-core
apt-get install -y --no-remove \
git \
git-lfs \
@ -83,7 +86,6 @@ apt-get install -y --no-remove \
python3-six \
python3-yaml \
socat \
sysvinit-core \
vulkan-tools \
waffle-utils \
wget \

10
.gitlab-ci/image-tags.yml
View file

@ -1,9 +1,9 @@
variables:
DEBIAN_X86_BUILD_BASE_IMAGE: "debian/x86_build-base"
DEBIAN_BASE_TAG: "2022-08-27-drop-wine32"
DEBIAN_BASE_TAG: "2022-09-07-ci-templates"
DEBIAN_X86_BUILD_IMAGE_PATH: "debian/x86_build"
DEBIAN_BUILD_TAG: "2022-07-29-s390xxx"
DEBIAN_BUILD_TAG: "2022-09-07-ci-templates"
DEBIAN_X86_BUILD_MINGW_IMAGE_PATH: "debian/x86_build-mingw"
DEBIAN_BUILD_MINGW_TAG: "2022-08-25-shellcheck"
@ -11,11 +11,11 @@ variables:
DEBIAN_X86_TEST_BASE_IMAGE: "debian/x86_test-base"
DEBIAN_X86_TEST_IMAGE_PATH: "debian/x86_test-gl"
DEBIAN_X86_TEST_GL_TAG: "2022-08-30-piglit-update-0"
DEBIAN_X86_TEST_VK_TAG: "2022-08-30-piglit-update-0"
DEBIAN_X86_TEST_GL_TAG: "2022-09-07-ci-templates"
DEBIAN_X86_TEST_VK_TAG: "2022-09-07-ci-templates"
FEDORA_X86_BUILD_TAG: "2022-08-25-shellcheck"
KERNEL_ROOTFS_TAG: "2022-08-30-piglit-update-0"
KERNEL_ROOTFS_TAG: "2022-09-07-ci-templates"
WINDOWS_X64_VS_PATH: "windows/x64_vs"
WINDOWS_X64_VS_TAG: "2022-08-17-bump"