diff options
| author | Matthew Leeds <matthew.leeds@endlessm.com> | 2019-09-06 12:14:23 -0700 |
|---|---|---|
| committer | Atomic Bot <atomic-devel@projectatomic.io> | 2019-09-09 09:49:46 +0000 |
| commit | f5cf3e264cd75292855ccc10369e66d55371480c (patch) | |
| tree | 74430ab2cae2fb360b8c93eea915d3140c5983a6 | |
| parent | cd978857bc4949dde5c604d8196b889b39fb5350 (diff) | |
| download | flatpak-f5cf3e264cd75292855ccc10369e66d55371480c.tar.gz | |
ci/libbuild.sh: Fix fedora release package issues
Attempt to fix the CI failure when running "yum -y install
@buildsys-build". This is copied from
https://github.com/ostreedev/ostree/commit/d85366d52
Closes: #3088
Approved by: alexlarsson
| -rw-r--r-- | ci/libbuild.sh | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/ci/libbuild.sh b/ci/libbuild.sh index 8bae4816..d73ce4d9 100644 --- a/ci/libbuild.sh +++ b/ci/libbuild.sh @@ -44,6 +44,11 @@ pkg_install_builddeps() { if test -x /usr/bin/dnf; then yum -y install dnf-plugins-core yum install -y 'dnf-command(builddep)' + # 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 + yum -y swap fedora-release{-container,} + fi # Base buildroot pkg_install @buildsys-build else |