summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWang Mingyu <wangmy@fujitsu.com>2024-08-20 14:51:24 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-08-21 21:51:49 +0100
commite6fe568f79116c96c7fe2ce85fdbe9de0837f7d6 (patch)
tree35b12a4f0d51e8603ed77679ed8424120e27b3c1
parentfbaf617f34e1c30482c3b87a8f09872b5ac98e93 (diff)
downloadpoky-e6fe568f79116c96c7fe2ce85fdbe9de0837f7d6.tar.gz
dnf: upgrade 4.21.0 -> 4.21.1
0005-Do-not-prepend-installroot-to-logdir.patch refreshed for 4.21.1 Changelog: ========== - doc: minor formatting and consistency fixes - Allow local downloads to same downloaddir - Fix "console" width on non real terminals (pipe) - Adds checks for container and bootc hosts - Update bootc hosts message to point to bootc --help - tests: Use PGP keys without SHA- (From OE-Core rev: 94b880c0c612cdc588c88f93774619fa86670852) 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.21.1.bb (renamed from meta/recipes-devtools/dnf/dnf_4.21.0.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 82f616a389..a85e6e3b03 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 4e0f83e931e059ba93604617c462adcc90e5baab Mon Sep 17 00:00:00 2001 1From a8bf39b4ecdbdfd6e6934ca046239f683a9e08e1 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 c14f8363..bfc07ab9 100644 17index 0eda2c8c..488a0662 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@@ -953,7 +953,7 @@ class Cli(object): 20@@ -952,7 +952,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.0.bb b/meta/recipes-devtools/dnf/dnf_4.21.1.bb
index 6800b5c716..09bdbd88a8 100644
--- a/meta/recipes-devtools/dnf/dnf_4.21.0.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.21.1.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 = "d29dfa0634235d7ad957c4746a749eb1e4a85a88" 23SRCREV = "9717c055b5ce94eba8c7144e6e4fea6ab6c97f6f"
24UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 24UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
25 25
26S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"