summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2023-12-19 17:32:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2023-12-23 08:46:00 +0000
commit54bd979f70c80cea9c60ba17373e5ddcf61a557b (patch)
treead5ab3ba218f68bec8e22df9c2d36e5e12461a75
parent3b5f6005a2b06842d17d7d0465b6262bba4a3b41 (diff)
downloadpoky-54bd979f70c80cea9c60ba17373e5ddcf61a557b.tar.gz
dnf: upgrade 4.18.1 -> 4.18.2
Changelog: ========= -automatic: Add feature to allow emitters to invoke on dnf error -dnssec: Fix parsing PGP keys for DNS validation 0005-Do-not-prepend-installroot-to-logdir.patch refreshed for new version. (From OE-Core rev: dc1c094e541f92986d00820bb49b780292410eb1) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch2
-rw-r--r--meta/recipes-devtools/dnf/dnf_4.18.2.bb (renamed from meta/recipes-devtools/dnf/dnf_4.18.1.bb)2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch b/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch
index aa20009cef..0e11c2eac2 100644
--- a/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch
+++ b/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch
@@ -17,7 +17,7 @@ diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
17index d2d9c082..82270ecf 100644 17index d2d9c082..82270ecf 100644
18--- a/dnf/cli/cli.py 18--- a/dnf/cli/cli.py
19+++ b/dnf/cli/cli.py 19+++ b/dnf/cli/cli.py
20@@ -920,7 +920,7 @@ class Cli(object): 20@@ -944,7 +944,7 @@ class Cli(object):
21 logger.warning(_("Unable to detect release version (use '--releasever' to specify " 21 logger.warning(_("Unable to detect release version (use '--releasever' to specify "
22 "release version)")) 22 "release version)"))
23 23
diff --git a/meta/recipes-devtools/dnf/dnf_4.18.1.bb b/meta/recipes-devtools/dnf/dnf_4.18.2.bb
index bc79db05c9..dc0c18be5e 100644
--- a/meta/recipes-devtools/dnf/dnf_4.18.1.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.18.2.bb
@@ -19,7 +19,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc
19 19
20SRC_URI:append:class-native = "file://0001-dnf-write-the-log-lock-to-root.patch" 20SRC_URI:append:class-native = "file://0001-dnf-write-the-log-lock-to-root.patch"
21 21
22SRCREV = "41a287e2bd60b4d1100c329a274776ff32ba8740" 22SRCREV = "1c43d0999178d492381ad0b43917ffd9c74016f8"
23UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 23UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
24 24
25S = "${WORKDIR}/git" 25S = "${WORKDIR}/git"