[OE-core] [PATCH 05/24] dnf: upgrade 4.21.0 -> 4.21.1

wangmy
2024-08-20T06:52:18Z

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-

Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
---
.../dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch | 6 +++---
meta/recipes-devtools/dnf/{dnf_4.21.0.bb => dnf_4.21.1.bb} | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
rename meta/recipes-devtools/dnf/{dnf_4.21.0.bb => dnf_4.21.1.bb} (98%)

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 @@
-From 4e0f83e931e059ba93604617c462adcc90e5baab Mon Sep 17 00:00:00 2001
+From a8bf39b4ecdbdfd6e6934ca046239f683a9e08e1 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Wed, 11 Jan 2017 15:10:13 +0200
Subject: [PATCH] Do not prepend installroot to logdir.
@@ -14,10 +14,10 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
-index c14f8363..bfc07ab9 100644
+index 0eda2c8c..488a0662 100644
--- a/dnf/cli/cli.py
+++ b/dnf/cli/cli.py
-@@ -953,7 +953,7 @@ class Cli(object):
+@@ -952,7 +952,7 @@ class Cli(object):
logger.warning(_("Unable to detect release version (use '--releasever' to specify "
"release version)"))

diff --git a/meta/recipes-devtools/dnf/dnf_4.21.0.bb b/meta/recipes-devtools/dnf/dnf_4.21.1.bb
similarity index 98%
rename from meta/recipes-devtools/dnf/dnf_4.21.0.bb
rename to 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

SRC_URI:append:class-native = " file://0001-dnf-write-the-log-lock-to-root.patch"

-SRCREV = "d29dfa0634235d7ad957c4746a749eb1e4a85a88"
+SRCREV = "9717c055b5ce94eba8c7144e6e4fea6ab6c97f6f"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"

S = "${WORKDIR}/git"
--
2.34.1