From: "Alexander Kanavin" <alex.kanavin@gmail.com>
To: openembedded-core@lists.openembedded.org
Cc: Alexander Kanavin <alex.kanavin@gmail.com>
Subject: [PATCH 04/15] dnf: upgrade 4.2.2 -> 4.2.21
Date: Sat, 25 Apr 2020 19:28:03 +0200 [thread overview]
Message-ID: <20200425172814.27370-4-alex.kanavin@gmail.com> (raw)
In-Reply-To: <20200425172814.27370-1-alex.kanavin@gmail.com>
Drop upstreamed patches.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
---
.../dnf/dnf/Fix-SyntaxWarning.patch | 34 -------------------
.../dnf/{dnf_4.2.2.bb => dnf_4.2.21.bb} | 3 +-
2 files changed, 1 insertion(+), 36 deletions(-)
delete mode 100644 meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch
rename meta/recipes-devtools/dnf/{dnf_4.2.2.bb => dnf_4.2.21.bb} (97%)
diff --git a/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch b/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch
deleted file mode 100644
index 1bd8b09594..0000000000
--- a/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From 23c5b15efe42e5e6ee695e54798bac248532d8d6 Mon Sep 17 00:00:00 2001
-
-Date: Tue, 28 May 2019 13:14:51 +0200
-Subject: [oe-core][PATCH 1/1] Fix SyntaxWarning: "is" with a literal. Did you
- mean "=="?
-
----
- dnf/cli/commands/repoquery.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
----
-
-Unchanged. Appears in version 4.2.7.
-
-Upstream-Status: Backport [git://github.com/rpm-software-management/dnf.git]
-
-Signed-off-by: Joe Slater <joe.slater@windriver.com>
-
-
-diff --git a/dnf/cli/commands/repoquery.py b/dnf/cli/commands/repoquery.py
-index 941a470..63fc668 100644
---- a/dnf/cli/commands/repoquery.py
-+++ b/dnf/cli/commands/repoquery.py
-@@ -611,7 +611,7 @@ class RepoQueryCommand(commands.Command):
-
- def tree_seed(self, query, aquery, opts, level=-1, usedpkgs=None):
- for pkg in sorted(set(query.run()), key=lambda p: p.name):
-- usedpkgs = set() if usedpkgs is None or level is -1 else usedpkgs
-+ usedpkgs = set() if usedpkgs is None or level == -1 else usedpkgs
- if pkg.name.startswith("rpmlib") or pkg.name.startswith("solvable"):
- return
- self.grow_tree(level, pkg, opts)
---
-2.7.4
-
diff --git a/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/meta/recipes-devtools/dnf/dnf_4.2.21.bb
similarity index 97%
rename from meta/recipes-devtools/dnf/dnf_4.2.2.bb
rename to meta/recipes-devtools/dnf/dnf_4.2.21.bb
index a046ffc05d..8f7757b72f 100644
--- a/meta/recipes-devtools/dnf/dnf_4.2.2.bb
+++ b/meta/recipes-devtools/dnf/dnf_4.2.21.bb
@@ -13,11 +13,10 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \
file://0005-Do-not-prepend-installroot-to-logdir.patch \
file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
file://0030-Run-python-scripts-using-env.patch \
- file://Fix-SyntaxWarning.patch \
file://0001-set-python-path-for-completion_helper.patch \
"
-SRCREV = "9947306a55271b8b7c9e2b6e3b7d582885b6045d"
+SRCREV = "864c381baabf024c299dca75abfda96139b8f583"
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
S = "${WORKDIR}/git"
--
2.26.1
next prev parent reply other threads:[~2020-04-25 17:28 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-25 17:28 [PATCH 01/15] rpm: upgrade to 4.15.1 Alexander Kanavin
2020-04-25 17:28 ` [PATCH 02/15] libmodulemd: move from 1.x to 2.x version Alexander Kanavin
2020-04-25 17:28 ` [PATCH 03/15] libdnf: upgrade 0.28.1 -> 0.47.0 Alexander Kanavin
2020-04-25 17:28 ` Alexander Kanavin [this message]
2020-04-25 17:28 ` [PATCH 05/15] quilt: do not test patch-wrapper as it is not enabled Alexander Kanavin
2020-04-25 17:28 ` [PATCH 06/15] libinput: add ptest Alexander Kanavin
2020-04-25 17:28 ` [PATCH 07/15] libinput: update 1.15.2 -> 1.15.5 Alexander Kanavin
2020-04-25 17:28 ` [PATCH 08/15] perl: update to 5.30.2 Alexander Kanavin
2020-04-25 17:28 ` [PATCH 09/15] gobject-introspection: update to 1.64.1 Alexander Kanavin
2020-04-25 17:28 ` [PATCH 10/15] python3-pyparsing: add from meta-oe Alexander Kanavin
2020-04-25 17:28 ` [PATCH 11/15] python3-cython: " Alexander Kanavin
2020-04-25 17:28 ` [PATCH 12/15] maintainers.inc: add entries for cython and pyparsing Alexander Kanavin
2020-04-25 17:28 ` [PATCH 13/15] python3-cython: update to 0.29.16 Alexander Kanavin
2020-04-25 17:28 ` [PATCH 14/15] python3-pyparsing: update to 2.4.7 Alexander Kanavin
2020-04-25 17:28 ` [PATCH 15/15] python3-numpy: update to 1.18.3 Alexander Kanavin
2020-04-26 17:34 ` [OE-core] [PATCH 01/15] rpm: upgrade to 4.15.1 Richard Purdie
2020-04-26 18:29 ` Alexander Kanavin
[not found] ` <160972188EAFC253.2907@lists.openembedded.org>
2020-04-26 20:40 ` Alexander Kanavin
2020-04-26 21:07 ` Richard Purdie
2020-04-27 9:09 ` Adrian Bunk
2020-04-27 9:54 ` Alexander Kanavin
2020-04-27 10:08 ` Adrian Bunk
2020-04-27 12:24 ` Alexander Kanavin
2020-04-27 12:30 ` Richard Purdie
2020-04-27 12:33 ` Alexander Kanavin
2020-04-27 12:42 ` Richard Purdie
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200425172814.27370-4-alex.kanavin@gmail.com \
--to=alex.kanavin@gmail.com \
--cc=openembedded-core@lists.openembedded.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.