From 837cf2e6e46e1127efdfbed4c90fd3d0c72ae750 Mon Sep 17 00:00:00 2001 From: Lubomir Rintel Date: Wed, 12 Feb 2025 12:48:47 +0100 Subject: [PATCH] gitlab/fedora-install: use yum install --allowerasing This allows us to drag in packages that replace something in the base image. Notably, this fixes installing pppd on Fedora 42 that requires systemd (whereas the image has conflicting systemd-standalone-sysusers). (cherry picked from commit 979717df4ee9d84cc3040d154596036576c3deae) --- .gitlab-ci/fedora-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitlab-ci/fedora-install.sh b/.gitlab-ci/fedora-install.sh index cafc0e552b..50f9710fc7 100755 --- a/.gitlab-ci/fedora-install.sh +++ b/.gitlab-ci/fedora-install.sh @@ -39,7 +39,7 @@ fi fi -NM_NO_EXTRA=1 NM_INSTALL="yum install -y" ./contrib/fedora/REQUIRED_PACKAGES +NM_NO_EXTRA=1 NM_INSTALL="yum install -y --allowerasing" ./contrib/fedora/REQUIRED_PACKAGES yum install -y glibc-langpack-pl ccache clang # containers have "tsflags=nodocs" in /etc/dnf/dnf.conf. We need /usr/shared/gtk-doc/html