<div dir="ltr"><div>These sanity test failures look related.</div><div><br></div><a href="https://autobuilder.yocto.io/builders/nightly-x86-64/builds/333/steps/Running%20Sanity%20Tests/logs/stdio">https://autobuilder.yocto.io/builders/nightly-x86-64/builds/333/steps/Running%20Sanity%20Tests/logs/stdio</a><br></div><div class="gmail_extra"><br><div class="gmail_quote">On 20 June 2017 at 16:56, Alexander Kanavin <span dir="ltr"><<a href="mailto:alexander.kanavin@linux.intel.com" target="_blank">alexander.kanavin@linux.intel.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><span class="">Drop 0001-Revert-proper-check-of-<wbr>releasever-when-using-install.<wbr>patch<br>
as the problem has been solved upstream.<br>
<br>
Signed-off-by: Alexander Kanavin <<a href="mailto:alexander.kanavin@linux.intel.com">alexander.kanavin@linux.<wbr>intel.com</a>><br>
---<br>
...er-check-of-releasever-<wbr>when-using-install.patch | 105 ---------------------<br>
</span> .../dnf/{<a href="http://dnf_git.bb" rel="noreferrer" target="_blank">dnf_git.bb</a> => <a href="http://dnf_2.5.1.bb" rel="noreferrer" target="_blank">dnf_2.5.1.bb</a>} | 4 +-<br>
2 files changed, 1 insertion(+), 108 deletions(-)<br>
delete mode 100644 meta/recipes-devtools/dnf/dnf/<wbr>0001-Revert-proper-check-of-<wbr>releasever-when-using-install.<wbr>patch<br>
rename meta/recipes-devtools/dnf/{<a href="http://dnf_git.bb" rel="noreferrer" target="_blank">dnf<wbr>_git.bb</a> => <a href="http://dnf_2.5.1.bb" rel="noreferrer" target="_blank">dnf_2.5.1.bb</a>} (94%)<br>
<div><div class="h5"><br>
diff --git a/meta/recipes-devtools/dnf/<wbr>dnf/0001-Revert-proper-check-<wbr>of-releasever-when-using-<wbr>install.patch b/meta/recipes-devtools/dnf/<wbr>dnf/0001-Revert-proper-check-<wbr>of-releasever-when-using-<wbr>install.patch<br>
deleted file mode 100644<br>
index 879ecfa30d7..00000000000<br>
--- a/meta/recipes-devtools/dnf/<wbr>dnf/0001-Revert-proper-check-<wbr>of-releasever-when-using-<wbr>install.patch<br>
+++ /dev/null<br>
@@ -1,105 +0,0 @@<br>
-From 8cd0503612573c455f34db74cd1c22<wbr>16ed25b69c Mon Sep 17 00:00:00 2001<br>
-From: Alexander Kanavin <<a href="mailto:alex.kanavin@gmail.com">alex.kanavin@gmail.com</a>><br>
-Date: Wed, 12 Apr 2017 15:42:06 +0300<br>
-Subject: [PATCH] Revert "proper check of releasever, when using installroot<br>
- (RhBug:1417542)"<br>
-<br>
-This reverts commit 3ddf684b7c67a2b384aa99dde53d8a<wbr>43218f2e68, as it's causing<br>
-breakage when installing packages into a pristin rootfs. Upstream has been notified:<br>
-<a href="https://bugzilla.redhat.com/show_bug.cgi?id=1441636" rel="noreferrer" target="_blank">https://bugzilla.redhat.com/<wbr>show_bug.cgi?id=1441636</a><br>
-<br>
-Upstream-Status: Inappropriate [pending proper fix]<br>
-Signed-off-by: Alex Kanavin <<a href="mailto:alex.kanavin@gmail.com">alex.kanavin@gmail.com</a>><br>
----<br>
- dnf/rpm/__init__.py | 59 +++++++++++++++++++++++++-----<wbr>-----------------------<br>
- doc/command_ref.rst | 3 +--<br>
- 2 files changed, 29 insertions(+), 33 deletions(-)<br>
-<br>
-diff --git a/dnf/rpm/__init__.py b/dnf/rpm/__init__.py<br>
-index 5976acd6..1d50e6a0 100644<br>
---- a/dnf/rpm/__init__.py<br>
-+++ b/dnf/rpm/__init__.py<br>
-@@ -30,38 +30,35 @@ def detect_releasever(installroot)<wbr>:<br>
- # :api<br>
- """Calculate the release version for the system."""<br>
-<br>
-- # if installroot is empty dir releasever is None,<br>
-- # that's why releasever is checked from '/'<br>
-- for root in [installroot, "/"]:<br>
-- ts = transaction.<wbr>initReadOnlyTransaction(root=<wbr>root)<br>
-- ts.pushVSFlags(~(rpm._RPMVSF_<wbr>NOSIGNATURES | rpm._RPMVSF_NODIGESTS))<br>
-- for distroverpkg in dnf.const.DISTROVERPKG:<br>
-- try:<br>
-- idx = ts.dbMatch('provides', distroverpkg)<br>
-- except (TypeError, rpm.error) as e:<br>
-- raise dnf.exceptions.Error('Error: %s' % str(e))<br>
-- if not len(idx):<br>
-- continue<br>
-- try:<br>
-- hdr = next(idx)<br>
-- except StopIteration:<br>
-- msg = 'Error: rpmdb failed to list provides. Try: rpm --rebuilddb'<br>
-- raise dnf.exceptions.Error(msg)<br>
-- releasever = hdr['version']<br>
-- try:<br>
-- off = hdr[rpm.RPMTAG_PROVIDENAME].<wbr>index(distroverpkg)<br>
-- flag = hdr[rpm.RPMTAG_PROVIDEFLAGS][<wbr>off]<br>
-- ver = hdr[rpm.RPMTAG_PROVIDEVERSION]<wbr>[off]<br>
-- if flag == rpm.RPMSENSE_EQUAL and ver:<br>
-- if hdr['name'] != distroverpkg:<br>
-- # override the package version<br>
-- releasever = ver<br>
-- except (ValueError, KeyError, IndexError):<br>
-- pass<br>
-+ ts = transaction.<wbr>initReadOnlyTransaction(root=<wbr>installroot)<br>
-+ ts.pushVSFlags(~(rpm._RPMVSF_<wbr>NOSIGNATURES | rpm._RPMVSF_NODIGESTS))<br>
-+ for distroverpkg in dnf.const.DISTROVERPKG:<br>
-+ try:<br>
-+ idx = ts.dbMatch('provides', distroverpkg)<br>
-+ except (TypeError, rpm.error) as e:<br>
-+ raise dnf.exceptions.Error('Error: %s' % str(e))<br>
-+ if not len(idx):<br>
-+ continue<br>
-+ try:<br>
-+ hdr = next(idx)<br>
-+ except StopIteration:<br>
-+ msg = 'Error: rpmdb failed to list provides. Try: rpm --rebuilddb'<br>
-+ raise dnf.exceptions.Error(msg)<br>
-+ releasever = hdr['version']<br>
-+ try:<br>
-+ off = hdr[rpm.RPMTAG_PROVIDENAME].<wbr>index(distroverpkg)<br>
-+ flag = hdr[rpm.RPMTAG_PROVIDEFLAGS][<wbr>off]<br>
-+ ver = hdr[rpm.RPMTAG_PROVIDEVERSION]<wbr>[off]<br>
-+ if flag == rpm.RPMSENSE_EQUAL and ver:<br>
-+ if hdr['name'] != distroverpkg:<br>
-+ # override the package version<br>
-+ releasever = ver<br>
-+ except (ValueError, KeyError, IndexError):<br>
-+ pass<br>
-<br>
-- if is_py3bytes(releasever):<br>
-- releasever = str(releasever, "utf-8")<br>
-- return releasever<br>
-+ if is_py3bytes(releasever):<br>
-+ releasever = str(releasever, "utf-8")<br>
-+ return releasever<br>
- return None<br>
-<br>
-<br>
-diff --git a/doc/command_ref.rst b/doc/command_ref.rst<br>
-index 77e885ab..3dd451b5 100644<br>
---- a/doc/command_ref.rst<br>
-+++ b/doc/command_ref.rst<br>
-@@ -205,8 +205,7 @@ Options<br>
- Note: You may also want to use the command-line option<br>
- ``--releasever=<release>`` when creating the installroot otherwise the<br>
- *$releasever* value is taken from the rpmdb within the installroot (and thus<br>
-- it is empty at time of creation and *$releasever* is taken from rpmdb using<br>
-- installroot=/).<br>
-+ it is empty at time of creation, the transaction will fail).<br>
- The new installroot path at time of creation do not contain *repository*,<br>
- *releasever*, and *dnf.conf* file.<br>
-<br>
---<br>
-2.11.0<br>
-<br>
</div></div>diff --git a/meta/recipes-devtools/dnf/<a href="http://dnf_git.bb" rel="noreferrer" target="_blank">dn<wbr>f_git.bb</a> b/meta/recipes-devtools/dnf/<a href="http://dnf_2.5.1.bb" rel="noreferrer" target="_blank">dn<wbr>f_2.5.1.bb</a><br>
similarity index 94%<br>
rename from meta/recipes-devtools/dnf/<a href="http://dnf_git.bb" rel="noreferrer" target="_blank">dnf_<wbr>git.bb</a><br>
rename to meta/recipes-devtools/dnf/<a href="http://dnf_2.5.1.bb" rel="noreferrer" target="_blank">dnf_<wbr>2.5.1.bb</a><br>
index c975900f85e..a07a509b768 100644<br>
--- a/meta/recipes-devtools/dnf/<a href="http://dnf_git.bb" rel="noreferrer" target="_blank">dn<wbr>f_git.bb</a><br>
+++ b/meta/recipes-devtools/dnf/<a href="http://dnf_2.5.1.bb" rel="noreferrer" target="_blank">dn<wbr>f_2.5.1.bb</a><br>
@@ -10,11 +10,9 @@ SRC_URI = "git://<a href="http://github.com/rpm-software-management/dnf.git" rel="noreferrer" target="_blank">github.com/rpm-<wbr>software-management/dnf.git</a> \<br>
<span class="im HOEnZb"> file://0001-Do-not-prepend-<wbr>installroot-to-logdir.patch \<br>
file://0001-Do-not-hardcode-<wbr>etc-and-systemd-unit-<wbr>directories.patch \<br>
file://0001-Corretly-install-<wbr>tmpfiles.d-configuration.patch \<br>
- file://0001-Revert-proper-<wbr>check-of-releasever-when-<wbr>using-install.patch \<br>
"<br>
<br>
-PV = "2.3.0"<br>
-SRCREV = "<wbr>242079563b54b4714c889fd4ee32e8<wbr>dd9960f3b8"<br>
</span><div class="HOEnZb"><div class="h5">+SRCREV = "<wbr>32e6ffdc8902b868cd8f98f9c399c9<wbr>8c9de0c7b8"<br>
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"<br>
<br>
S = "${WORKDIR}/git"<br>
--<br>
2.11.0<br>
<br>
--<br>
______________________________<wbr>_________________<br>
Openembedded-core mailing list<br>
<a href="mailto:Openembedded-core@lists.openembedded.org">Openembedded-core@lists.<wbr>openembedded.org</a><br>
<a href="http://lists.openembedded.org/mailman/listinfo/openembedded-core" rel="noreferrer" target="_blank">http://lists.openembedded.org/<wbr>mailman/listinfo/openembedded-<wbr>core</a><br>
</div></div></blockquote></div><br></div>