From 82c905dc58a36aeae40b1b273a12f63fb1973cf4 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Mon, 13 Apr 2020 13:39:40 -0500 Subject: meta-openembedded and poky: subtree updates Squash of the following due to dependencies among them and OpenBMC changes: meta-openembedded: subtree update:d0748372d2..9201611135 meta-openembedded: subtree update:9201611135..17fd382f34 poky: subtree update:9052e5b32a..2e11d97b6c poky: subtree update:2e11d97b6c..a8544811d7 The change log was too large for the jenkins plugin to handle therefore it has been removed. Here is the first and last commit of each subtree: meta-openembedded:d0748372d2 cppzmq: bump to version 4.6.0 meta-openembedded:17fd382f34 mpv: Remove X11 dependency poky:9052e5b32a package_ipk: Remove pointless comment to trigger rebuild poky:a8544811d7 pbzip2: Fix license warning Change-Id: If0fc6c37629642ee207a4ca2f7aa501a2c673cd6 Signed-off-by: Andrew Geissler --- ...001-set-python-path-for-completion_helper.patch | 24 +++++++++++++++ .../dnf/dnf/Fix-SyntaxWarning.patch | 34 ++++++++++++++++++++++ poky/meta/recipes-devtools/dnf/dnf_4.2.2.bb | 4 +++ 3 files changed, 62 insertions(+) create mode 100644 poky/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch create mode 100644 poky/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch (limited to 'poky/meta/recipes-devtools/dnf') diff --git a/poky/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch b/poky/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch new file mode 100644 index 000000000..448f6408b --- /dev/null +++ b/poky/meta/recipes-devtools/dnf/dnf/0001-set-python-path-for-completion_helper.patch @@ -0,0 +1,24 @@ +From 7e79b3b67fd5cecd7380e7e365fd88eca63b5bfa Mon Sep 17 00:00:00 2001 +From: Jeremy Puhlman +Date: Wed, 11 Mar 2020 22:10:02 +0000 +Subject: [PATCH] set python path for completion_helper + +Upstream-Status: Inappropriate [oe-core specific] +Signed-off-by: Jeremy Puhlman +--- + dnf/cli/completion_helper.py.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/dnf/cli/completion_helper.py.in b/dnf/cli/completion_helper.py.in +index 351226759..2835cd3b6 100644 +--- a/dnf/cli/completion_helper.py.in ++++ b/dnf/cli/completion_helper.py.in +@@ -1,4 +1,4 @@ +-#!@PYTHON_EXECUTABLE@ ++#!/usr/bin/env python3 + # + # This file is part of dnf. + # +-- +2.23.0 + diff --git a/poky/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch b/poky/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch new file mode 100644 index 000000000..1bd8b0959 --- /dev/null +++ b/poky/meta/recipes-devtools/dnf/dnf/Fix-SyntaxWarning.patch @@ -0,0 +1,34 @@ +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 + + +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/poky/meta/recipes-devtools/dnf/dnf_4.2.2.bb b/poky/meta/recipes-devtools/dnf/dnf_4.2.2.bb index f38167f1a..a046ffc05 100644 --- a/poky/meta/recipes-devtools/dnf/dnf_4.2.2.bb +++ b/poky/meta/recipes-devtools/dnf/dnf_4.2.2.bb @@ -13,6 +13,8 @@ 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" @@ -84,3 +86,5 @@ SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ " SYSTEMD_AUTO_ENABLE ?= "disable" + +PNBLACKLIST[dnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}" -- cgit v1.2.3