summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-11-26 09:29:47 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-11-27 16:44:47 +0000
commita8aa6c306070da25e95502210789431234ff9250 (patch)
treeab80187ed0bb8da98e8d2e035059be5ba679dc0c
parente9a670233411531d6998409042970a8be26cb9c2 (diff)
downloadpoky-a8aa6c306070da25e95502210789431234ff9250.tar.gz
dnf: upgrade 4.21.1 -> 4.22.0
0005-Do-not-prepend-installroot-to-logdir.patch refreshed for 4.22.0 Changelog: ============= - doc: Naming of source and debug repos - Fix /var/cache/dnf and /etc/yum packaging - Allow --installroot on read-only bootc system - spec: If DNF5 obsoletes DNF, do not build dnf and yum packages - Print rpm unpack errors to the user (RhBug:2312906) - package: remote_location() takes basedir into account - spec: If DNF5 obsoletes DNF, do not build dnf-automatic - Allow --downloadonly on read-only bootc system - Add kernel-core to reboot_needed list - Update need_reboot for dnf-automatic - doc: Example send_error_messages in /etc/dnf/automatic.conf - automatic: Check availability of config file - Updated conf_ref to reflect change in fastestmirror behavior - doc: Fix display issue of a code snippet (From OE-Core rev: 7a97281b65f1cd0268217e44819a0b55faa20178) Signed-off-by: Wang Mingyu <wangmy@fujitsu.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.patch6
-rw-r--r--meta/recipes-devtools/dnf/dnf_4.22.0.bb (renamed from meta/recipes-devtools/dnf/dnf_4.21.1.bb)2
2 files changed, 4 insertions, 4 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 a85e6e3b03..a1c58d6563 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
@@ -1,4 +1,4 @@
1From a8bf39b4ecdbdfd6e6934ca046239f683a9e08e1 Mon Sep 17 00:00:00 2001 1From 0e7fc4a8523aad616493e6ad33c509e1e530d852 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 11 Jan 2017 15:10:13 +0200 3Date: Wed, 11 Jan 2017 15:10:13 +0200
4Subject: [PATCH] Do not prepend installroot to logdir. 4Subject: [PATCH] Do not prepend installroot to logdir.
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py 16diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
17index 0eda2c8c..488a0662 100644 17index d3844df3..ac080f79 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@@ -952,7 +952,7 @@ class Cli(object): 20@@ -954,7 +954,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.21.1.bb b/meta/recipes-devtools/dnf/dnf_4.22.0.bb
index 09bdbd88a8..3f94dfc9a5 100644
--- a/meta/recipes-devtools/dnf/dnf_4.21.1.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.22.0.bb
@@ -20,7 +20,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git;branch=master;protoc
20 20
21SRC_URI:append:class-native = " file://0001-dnf-write-the-log-lock-to-root.patch" 21SRC_URI:append:class-native = " file://0001-dnf-write-the-log-lock-to-root.patch"
22 22
23SRCREV = "9717c055b5ce94eba8c7144e6e4fea6ab6c97f6f" 23SRCREV = "da9a7066be8e1628d9453428d33685225cd9c90d"
24UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 24UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
25 25
26S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"