summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorColin Walters <walters@verbum.org>2023-04-26 09:46:57 -0400
committerColin Walters <walters@verbum.org>2023-04-26 09:46:57 -0400
commit64aa5af2360985346c5c25c07f01225eebd445c4 (patch)
treefe31faaab0a799fc6d61686faf2e7f423d9dac1a
parent3391d8f3f0579e9686c43325dd8c8509a4844ac9 (diff)
downloadostree-64aa5af2360985346c5c25c07f01225eebd445c4.tar.gz
ci: Drop workaround for fedora-release-container
I think this isn't necessary anymore, and is now actively broken with f38.
-rw-r--r--ci/libbuild.sh5
1 files changed, 0 insertions, 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