From 64aa5af2360985346c5c25c07f01225eebd445c4 Mon Sep 17 00:00:00 2001 From: Colin Walters Date: Wed, 26 Apr 2023 09:46:57 -0400 Subject: ci: Drop workaround for fedora-release-container I think this isn't necessary anymore, and is now actively broken with f38. --- ci/libbuild.sh | 5 ----- 1 file changed, 5 deletions(-) diff --git a/ci/libbuild.sh b/ci/libbuild.sh index ffc65585..9938e282 100644 --- a/ci/libbuild.sh +++ b/ci/libbuild.sh @@ -36,11 +36,6 @@ pkg_install_if_os() { pkg_install_buildroot() { case "${OS_ID}" in fedora) - # https://github.com/projectatomic/rpm-ostree/pull/1889/commits/9ff611758bea22b0ad4892cc16182dd1f7f47e89 - # https://fedoraproject.org/wiki/Common_F30_bugs#Conflicts_between_fedora-release_packages_when_installing_package_groups - if rpm -q fedora-release-container; then - dnf -y swap fedora-release{-container,} - fi pkg_install dnf-plugins-core @buildsys-build;; *) fatal "pkg_install_buildroot(): Unhandled OS ${OS_ID}";; esac -- cgit v1.2.1