rpms/rpm-ostree
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Backport patch for Silverblue composes:

Browse Source 
https://pagure.io/releng/failed-composes/issue/717
https://github.com/coreos/rpm-ostree/pull/1961
This commit is contained in:
Jonathan Lebon 2020-01-09 09:36:41 -05:00
parent cead07812e
commit b72be82555
2 changed files with 46 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
0001-core-Mark-all-repos-as-modular-hotfixes.patch Normal file
View File

@ -0,0 +1,38 @@
From 2966afe44eaa24d143af4cac02d9a84cb343aa3b Mon Sep 17 00:00:00 2001
From: Jonathan Lebon <jonathan@jlebon.com>
Date: Tue, 7 Jan 2020 17:25:12 -0500
Subject: [PATCH] core: Mark all repos as "modular hotfixes"
This is a follow-up hack to #1797 to force libdnf to let us use modular
packages as if they were regular packages until we actually support
modules correctly (#1435).
A repo marked as a modular hotfix means that libdnf doesn't try to
filter out modular RPMs from the repo as it usually does.
Resolves: https://pagure.io/releng/failed-composes/issue/717
---
src/libpriv/rpmostree-core.c | 6 ++++++
2 files changed, 6 insertions(+), 15 deletions(-)
diff --git a/src/libpriv/rpmostree-core.c b/src/libpriv/rpmostree-core.c
index 5ec673db..b0e7150a 100644
--- a/src/libpriv/rpmostree-core.c
+++ b/src/libpriv/rpmostree-core.c
@@ -1158,6 +1158,12 @@ rpmostree_context_download_metadata (RpmOstreeContext *self,
* So for now, let's tell libdnf that we do want to be able to see them. See:
* https://github.com/projectatomic/rpm-ostree/issues/1435 */
dnf_sack_set_module_excludes (dnf_context_get_sack (self->dnfctx), NULL);
+ /* And also mark all repos as hotfix repos so that we can indiscriminately cherry-pick
+ * from modular repos and non-modular repos alike. */
+ g_autoptr(GPtrArray) repos =
+ rpmostree_get_enabled_rpmmd_repos (self->dnfctx, DNF_REPO_ENABLED_PACKAGES);
+ for (guint i = 0; i < repos->len; i++)
+ dnf_repo_set_module_hotfixes (repos->pdata[i], TRUE);
return TRUE;
}
--
2.24.1

10
rpm-ostree.spec
View File

@ -4,7 +4,7 @@
Summary: Hybrid image/package system
Name: rpm-ostree
Version: 2019.7
Release: 1%{?dist}
Release: 2%{?dist}
#VCS: https://github.com/cgwalters/rpm-ostree
# This tarball is generated via "cd packaging && make -f Makefile.dist-packaging dist-snapshot"
# in the upstream git. If rust is enabled, it contains vendored sources.
@ -12,6 +12,8 @@ Source0: rpm-ostree-%{version}.tar.xz
License: LGPLv2+
URL: https://github.com/projectatomic/rpm-ostree
Patch0: 0001-core-Mark-all-repos-as-modular-hotfixes.patch
ExclusiveArch: %{rust_arches}
%if 0%{?fedora}
@ -190,7 +192,11 @@ $PYTHON autofiles.py > files.devel \
%files devel -f files.devel
%changelog
* Thu Dec 19 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.7
* Thu Jan 09 2020 Jonathan Lebon <jonathan@jlebon.com> - 2019.7-2
- Backport patch for Silverblue composes:
https://pagure.io/releng/failed-composes/issue/717
* Thu Dec 19 2019 Jonathan Lebon <jonathan@jlebon.com> - 2019.7-1
- New upstream version
* Sat Dec 14 2019 Jeff Law <law@redhat.com> - 2019.6.24.gfec61ce5-2