diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2021-05-05 17:18:19 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-05-09 23:30:15 +0100 |
commit | 21bd255395aea31de7ffecf49702f6e3a43db162 (patch) | |
tree | 19c8e6238c79e7c41bedd9e872c979512ca8c943 /meta/recipes-devtools/dnf/dnf | |
parent | ad7581132d7d2b65957fcd082060b2b5fcb8305f (diff) | |
download | poky-21bd255395aea31de7ffecf49702f6e3a43db162.tar.gz |
dnf: upgrade 4.6.0 -> 4.7.0
(From OE-Core rev: 432352dddc97eb19cefacd8644fb59b1f10bc2d3)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/dnf/dnf')
-rw-r--r-- | meta/recipes-devtools/dnf/dnf/0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch | 39 | ||||
-rw-r--r-- | meta/recipes-devtools/dnf/dnf/0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch | 37 |
2 files changed, 76 insertions, 0 deletions
diff --git a/meta/recipes-devtools/dnf/dnf/0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch b/meta/recipes-devtools/dnf/dnf/0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch new file mode 100644 index 0000000000..99afe09840 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0001-dnf-rpm-miscutils.py-fix-usage-of-_.patch | |||
@@ -0,0 +1,39 @@ | |||
1 | From 2729c00f0060beab8537a9bebc796b170949093d Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 4 May 2021 22:03:30 +0200 | ||
4 | Subject: [PATCH 1/2] dnf/rpm/miscutils.py: fix usage of _() | ||
5 | |||
6 | Specifically: | ||
7 | - an import of _ was missing | ||
8 | - _ was reused for a different purpose | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/1762] | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | dnf/rpm/miscutils.py | 3 ++- | ||
14 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/dnf/rpm/miscutils.py b/dnf/rpm/miscutils.py | ||
17 | index 235aaf28f..7e33d4c42 100644 | ||
18 | --- a/dnf/rpm/miscutils.py | ||
19 | +++ b/dnf/rpm/miscutils.py | ||
20 | @@ -22,6 +22,7 @@ import subprocess | ||
21 | import logging | ||
22 | |||
23 | from dnf.i18n import ucd | ||
24 | +from dnf.i18n import _ | ||
25 | from shutil import which | ||
26 | |||
27 | |||
28 | @@ -46,7 +47,7 @@ def _verifyPkgUsingRpmkeys(package, installroot): | ||
29 | env={'LC_ALL': 'C'}, | ||
30 | stdout=subprocess.PIPE, | ||
31 | cwd='/') as p: | ||
32 | - data, _ = p.communicate() | ||
33 | + data, err = p.communicate() | ||
34 | if p.returncode != 0 or data != (package.encode('ascii', 'strict') + b': digests signatures OK\n'): | ||
35 | return 0 | ||
36 | else: | ||
37 | -- | ||
38 | 2.31.1 | ||
39 | |||
diff --git a/meta/recipes-devtools/dnf/dnf/0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch b/meta/recipes-devtools/dnf/dnf/0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch new file mode 100644 index 0000000000..b4c9e074d6 --- /dev/null +++ b/meta/recipes-devtools/dnf/dnf/0002-dnf-rpm-miscutils.py-do-not-hardcode-usr-bin-rpmkeys.patch | |||
@@ -0,0 +1,37 @@ | |||
1 | From dc14022a99dc017c52c484efb32729729baf854c Mon Sep 17 00:00:00 2001 | ||
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | ||
3 | Date: Tue, 4 May 2021 22:07:32 +0200 | ||
4 | Subject: [PATCH 2/2] dnf/rpm/miscutils.py: do not hardcode /usr/bin/rpmkeys | ||
5 | |||
6 | Some build systems (e.g. Yocto) place a specially configured | ||
7 | rpmkeys executable elsewhere and set up PATH accordingly; | ||
8 | it's better to always take it from there. | ||
9 | |||
10 | Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/1763] | ||
11 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | ||
12 | --- | ||
13 | dnf/rpm/miscutils.py | 8 +++----- | ||
14 | 1 file changed, 3 insertions(+), 5 deletions(-) | ||
15 | |||
16 | diff --git a/dnf/rpm/miscutils.py b/dnf/rpm/miscutils.py | ||
17 | index 7e33d4c42..fcd956db9 100644 | ||
18 | --- a/dnf/rpm/miscutils.py | ||
19 | +++ b/dnf/rpm/miscutils.py | ||
20 | @@ -30,11 +30,9 @@ logger = logging.getLogger('dnf') | ||
21 | |||
22 | |||
23 | def _verifyPkgUsingRpmkeys(package, installroot): | ||
24 | - rpmkeys_binary = '/usr/bin/rpmkeys' | ||
25 | - if not os.path.isfile(rpmkeys_binary): | ||
26 | - rpmkeys_binary = which("rpmkeys") | ||
27 | - logger.info(_('Using rpmkeys executable from {path} to verify signature for package: {package}.').format( | ||
28 | - path=rpmkeys_binary, package=package)) | ||
29 | + rpmkeys_binary = which("rpmkeys") | ||
30 | + logger.info(_('Using rpmkeys executable from {path} to verify signature for package: {package}.').format( | ||
31 | + path=rpmkeys_binary, package=package)) | ||
32 | |||
33 | if not os.path.isfile(rpmkeys_binary): | ||
34 | logger.critical(_('Cannot find rpmkeys executable to verify signatures.')) | ||
35 | -- | ||
36 | 2.31.1 | ||
37 | |||