ci: Drop workaround for fedora-release-container
authorColin Walters <walters@verbum.org>
Wed, 26 Apr 2023 13:46:57 +0000 (09:46 -0400)
committerColin Walters <walters@verbum.org>
Wed, 26 Apr 2023 13:46:57 +0000 (09:46 -0400)
I think this isn't necessary anymore, and is now actively broken
with f38.

ci/libbuild.sh

index ffc65585aaf85ab37007d0367092e41cbec5fbdc..9938e282fa16602830d43b1907bfd1937d2234bc 100644 (file)
@@ -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