summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-08-07 14:44:58 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-13 09:27:37 +0100
commitb91d3fe32660b1e04ac85f7ad4559443435e7edd (patch)
treebaed85fa20b1612b0cd4aa36b35ac48a5de768a5 /meta
parent365b18dbef1e28db4688129cc3ad3db111b03285 (diff)
downloadpoky-b91d3fe32660b1e04ac85f7ad4559443435e7edd.tar.gz
dnf: update to 2.6.3
(From OE-Core rev: 685d7ec1114fa2ec4aa44f7e29d1e159f7899d4d) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch37
-rw-r--r--meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch13
-rw-r--r--meta/recipes-devtools/dnf/dnf_2.6.3.bb (renamed from meta/recipes-devtools/dnf/dnf_2.5.1.bb)3
3 files changed, 2 insertions, 51 deletions
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch b/meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch
deleted file mode 100644
index daf058bbae..0000000000
--- a/meta/recipes-devtools/dnf/dnf/0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 3d0cdd8af1b415712eeb00e377c307001684ad06 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 21 Jun 2017 15:35:20 +0300
4Subject: [PATCH] Move releasever check after the etc/dnf/vars substitutions.
5
6The substitutions may actually set the releasever correctly,
7and so the check is premature.
8
9Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/868]
10Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
11---
12 dnf/cli/cli.py | 6 +++---
13 1 file changed, 3 insertions(+), 3 deletions(-)
14
15diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
16index c53c2a52..f9f2c13a 100644
17--- a/dnf/cli/cli.py
18+++ b/dnf/cli/cli.py
19@@ -882,12 +882,12 @@ class Cli(object):
20 releasever = dnf.rpm.detect_releasever(conf.installroot)
21 elif releasever == '/':
22 releasever = dnf.rpm.detect_releasever(releasever)
23- if releasever is None:
24- logger.warning(_("Unable to detect release version (use '--releasever' to specify "
25- "release version)"))
26 conf.releasever = releasever
27 subst = conf.substitutions
28 subst.update_from_etc(conf.installroot)
29+ if releasever is None:
30+ logger.warning(_("Unable to detect release version (use '--releasever' to specify "
31+ "release version)"))
32
33 for opt in ('cachedir', 'logdir', 'persistdir'):
34 conf.prepend_installroot(opt)
35--
362.11.0
37
diff --git a/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch b/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch
index 61328e6ec5..1abd880da9 100644
--- a/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch
+++ b/meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch
@@ -10,8 +10,7 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10--- 10---
11 bin/dnf-automatic.in | 2 +- 11 bin/dnf-automatic.in | 2 +-
12 bin/dnf.in | 2 +- 12 bin/dnf.in | 2 +-
13 bin/yum.in | 2 +- 13 2 files changed, 2 insertions(+), 2 deletions(-)
14 3 files changed, 3 insertions(+), 3 deletions(-)
15 14
16diff --git a/bin/dnf-automatic.in b/bin/dnf-automatic.in 15diff --git a/bin/dnf-automatic.in b/bin/dnf-automatic.in
17index 5b06aa26..9f6f703e 100755 16index 5b06aa26..9f6f703e 100755
@@ -33,16 +32,6 @@ index 645d0f06..ab141abd 100755
33 # The dnf executable script. 32 # The dnf executable script.
34 # 33 #
35 # Copyright (C) 2012-2016 Red Hat, Inc. 34 # Copyright (C) 2012-2016 Red Hat, Inc.
36diff --git a/bin/yum.in b/bin/yum.in
37index f1fee071..013dc8c5 100755
38--- a/bin/yum.in
39+++ b/bin/yum.in
40@@ -1,4 +1,4 @@
41-#!@PYTHON_EXECUTABLE@
42+#!/usr/bin/env python3
43 # The dnf executable script.
44 #
45 # Copyright (C) 2016 Red Hat, Inc.
46-- 35--
472.11.0 362.11.0
48 37
diff --git a/meta/recipes-devtools/dnf/dnf_2.5.1.bb b/meta/recipes-devtools/dnf/dnf_2.6.3.bb
index cdc2a8549f..ade55ea0a8 100644
--- a/meta/recipes-devtools/dnf/dnf_2.5.1.bb
+++ b/meta/recipes-devtools/dnf/dnf_2.6.3.bb
@@ -5,7 +5,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \
5 " 5 "
6 6
7SRC_URI = "git://github.com/rpm-software-management/dnf.git \ 7SRC_URI = "git://github.com/rpm-software-management/dnf.git \
8 file://0001-Move-releasever-check-after-the-etc-dnf-vars-substit.patch \
9 file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ 8 file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
10 file://0030-Run-python-scripts-using-env.patch \ 9 file://0030-Run-python-scripts-using-env.patch \
11 file://0001-Do-not-prepend-installroot-to-logdir.patch \ 10 file://0001-Do-not-prepend-installroot-to-logdir.patch \
@@ -13,7 +12,7 @@ SRC_URI = "git://github.com/rpm-software-management/dnf.git \
13 file://0001-Corretly-install-tmpfiles.d-configuration.patch \ 12 file://0001-Corretly-install-tmpfiles.d-configuration.patch \
14 " 13 "
15 14
16SRCREV = "32e6ffdc8902b868cd8f98f9c399c98c9de0c7b8" 15SRCREV = "be2585183ec4485ee4d5e121f242d8669296f065"
17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 16UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
18 17
19S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"