From: Wang Mingyu Date: Wed, 10 Jul 2024 09:43:32 +0000 (+0800) Subject: dnf: upgrade 4.20.0 -> 4.21.0 X-Git-Tag: uninative-4.6~88 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f289b8ef7a59016f630347b184b5507762d4586f;p=thirdparty%2Fopenembedded%2Fopenembedded-core.git dnf: upgrade 4.20.0 -> 4.21.0 0005-Do-not-prepend-installroot-to-logdir.patch refreshed for 4.21.0 Changelog: =========== - Add detection for ostree-based systems and warn users about losing changes - Fix: No traceback when Python interpreter is running with -P, allow -P in shebang lines - man: Improve upgrade-minimal command docs (RHEL-6417) - Limit queries to nevra forms when provided by command - Update the man page entry for the countme option - Drop collect file for ABRT Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- 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 cfbda11f77b..82f616a389b 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 c6d03b51e2098fc681e6811790bd5dc6597091eb Mon Sep 17 00:00:00 2001 +From 4e0f83e931e059ba93604617c462adcc90e5baab Mon Sep 17 00:00:00 2001 From: Alexander Kanavin 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 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py -index 1824bd00..4dcb1c1c 100644 +index c14f8363..bfc07ab9 100644 --- a/dnf/cli/cli.py +++ b/dnf/cli/cli.py -@@ -944,7 +944,7 @@ class Cli(object): +@@ -953,7 +953,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.20.0.bb b/meta/recipes-devtools/dnf/dnf_4.21.0.bb similarity index 98% rename from meta/recipes-devtools/dnf/dnf_4.20.0.bb rename to meta/recipes-devtools/dnf/dnf_4.21.0.bb index 98edab06142..6800b5c716c 100644 --- a/meta/recipes-devtools/dnf/dnf_4.20.0.bb +++ b/meta/recipes-devtools/dnf/dnf_4.21.0.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 = "e3cb438c0fd08c79676c0f3276aa7d75cd8557c6" +SRCREV = "d29dfa0634235d7ad957c4746a749eb1e4a85a88" UPSTREAM_CHECK_GITTAGREGEX = "(?P\d+(\.\d+)+)" S = "${WORKDIR}/git"