summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-10-04 17:39:46 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-02 17:24:37 +0000
commit5623065801b977aa6e27f2d75f3a471224731d64 (patch)
treea31c02dffcd8aae7b9e357bf8ee119b392db4046
parent798a83865e3446c81e4af75e812f86af9db09bfe (diff)
downloadpoky-5623065801b977aa6e27f2d75f3a471224731d64.tar.gz
dnf: update to 2.7.5
Drop upstreamed patch. Rebase the other patches. (From OE-Core rev: 17a537bb5d28ceb9fec0320dc18e6e3688d5993c) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch31
-rw-r--r--meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch7
-rw-r--r--meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch9
-rw-r--r--meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch (renamed from meta/recipes-devtools/dnf/dnf/0001-Do-not-prepend-installroot-to-logdir.patch)14
-rw-r--r--meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch9
-rw-r--r--meta/recipes-devtools/dnf/dnf/0030-Run-python-scripts-using-env.patch11
-rw-r--r--meta/recipes-devtools/dnf/dnf_2.7.5.bb (renamed from meta/recipes-devtools/dnf/dnf_2.6.3.bb)10
7 files changed, 32 insertions, 59 deletions
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch b/meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch
deleted file mode 100644
index 05f3141517..0000000000
--- a/meta/recipes-devtools/dnf/dnf/0001-Check-conf.releasever-instead-of-releasever.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 166833a88a928a574bf9143b9b65f544be482c77 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 18 Aug 2017 15:55:15 +0300
4Subject: [PATCH] Check conf.releasever instead of releasever
5
6The substitutions may actually set the conf.releasever correctly,
7and so the check should use that instead of the passed-in function
8parameter.
9
10Upstream-Status: Submitted [https://github.com/rpm-software-management/dnf/pull/901]
11Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12---
13 dnf/cli/cli.py | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
17index 2d63420c..167943b8 100644
18--- a/dnf/cli/cli.py
19+++ b/dnf/cli/cli.py
20@@ -914,7 +914,7 @@ class Cli(object):
21 conf.releasever = releasever
22 subst = conf.substitutions
23 subst.update_from_etc(conf.installroot)
24- if releasever is None:
25+ if conf.releasever is None:
26 logger.warning(_("Unable to detect release version (use '--releasever' to specify "
27 "release version)"))
28
29--
302.14.1
31
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch b/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch
index c9df458974..6692b41a16 100644
--- a/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch
+++ b/meta/recipes-devtools/dnf/dnf/0001-Corretly-install-tmpfiles.d-configuration.patch
@@ -1,10 +1,11 @@
1From 8ce181714640315d2dd37ee794acbb22063cd669 Mon Sep 17 00:00:00 2001 1From 05e059cd4e9910c00b32d377f4f98e3c8dde6bc6 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 26 Jan 2017 16:36:20 +0200 3Date: Thu, 26 Jan 2017 16:36:20 +0200
4Subject: [PATCH] Corretly install tmpfiles.d configuration 4Subject: [PATCH 4/5] Corretly install tmpfiles.d configuration
5 5
6Upstream-Status: Inappropriate [oe-core specific] 6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
8--- 9---
9 etc/tmpfiles.d/CMakeLists.txt | 2 +- 10 etc/tmpfiles.d/CMakeLists.txt | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
@@ -17,5 +18,5 @@ index f69c773e..3eb6d0e8 100644
17-INSTALL (FILES dnf.conf DESTINATION /usr/lib/tmpfiles.d/) 18-INSTALL (FILES dnf.conf DESTINATION /usr/lib/tmpfiles.d/)
18+INSTALL (FILES dnf.conf DESTINATION ${SYSCONFDIR}/tmpfiles.d/) 19+INSTALL (FILES dnf.conf DESTINATION ${SYSCONFDIR}/tmpfiles.d/)
19-- 20--
202.11.0 212.14.2
21 22
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch
index 0f261e5c5d..15a7bfc732 100644
--- a/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch
+++ b/meta/recipes-devtools/dnf/dnf/0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch
@@ -1,16 +1,17 @@
1From 4313ced1320594013795f11f6db00381e3f4cc45 Mon Sep 17 00:00:00 2001 1From a8ef81c115a45f05dad145c98e10f3c4940e4e29 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Thu, 26 Jan 2017 16:25:47 +0200 3Date: Thu, 26 Jan 2017 16:25:47 +0200
4Subject: [PATCH] Do not hardcode /etc and systemd unit directories 4Subject: [PATCH 3/5] Do not hardcode /etc and systemd unit directories
5 5
6Upstream-Status: Inappropriate [oe-core specific] 6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
8--- 9---
9 CMakeLists.txt | 4 ++-- 10 CMakeLists.txt | 4 ++--
10 1 file changed, 2 insertions(+), 2 deletions(-) 11 1 file changed, 2 insertions(+), 2 deletions(-)
11 12
12diff --git a/CMakeLists.txt b/CMakeLists.txt 13diff --git a/CMakeLists.txt b/CMakeLists.txt
13index 6a319935..db20ccd4 100644 14index 650b624a..10199618 100644
14--- a/CMakeLists.txt 15--- a/CMakeLists.txt
15+++ b/CMakeLists.txt 16+++ b/CMakeLists.txt
16@@ -7,8 +7,8 @@ if (NOT PYTHON_DESIRED) 17@@ -7,8 +7,8 @@ if (NOT PYTHON_DESIRED)
@@ -25,5 +26,5 @@ index 6a319935..db20ccd4 100644
25 if (${PYTHON_DESIRED} STREQUAL "2") 26 if (${PYTHON_DESIRED} STREQUAL "2")
26 FIND_PACKAGE (PythonInterp REQUIRED) 27 FIND_PACKAGE (PythonInterp REQUIRED)
27-- 28--
282.11.0 292.14.2
29 30
diff --git a/meta/recipes-devtools/dnf/dnf/0001-Do-not-prepend-installroot-to-logdir.patch b/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch
index a90e77cbf1..aa20009cef 100644
--- a/meta/recipes-devtools/dnf/dnf/0001-Do-not-prepend-installroot-to-logdir.patch
+++ b/meta/recipes-devtools/dnf/dnf/0005-Do-not-prepend-installroot-to-logdir.patch
@@ -1,7 +1,7 @@
1From 31653d324cf8c7b1f2f9e49d22676bd2ac546331 Mon Sep 17 00:00:00 2001 1From 6365389074a1b86962f3d8b22a2ead2202026a98 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Wed, 11 Jan 2017 15:10:13 +0200 3Date: Wed, 11 Jan 2017 15:10:13 +0200
4Subject: [PATCH] Do not prepend installroot to logdir. 4Subject: [PATCH 5/5] Do not prepend installroot to logdir.
5 5
6This would otherwise write the logs into rootfs/var/log 6This would otherwise write the logs into rootfs/var/log
7(whereas we want them in $T), 7(whereas we want them in $T),
@@ -14,12 +14,12 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 1 file changed, 1 insertion(+), 1 deletion(-) 14 1 file changed, 1 insertion(+), 1 deletion(-)
15 15
16diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py 16diff --git a/dnf/cli/cli.py b/dnf/cli/cli.py
17index b764801a..893f4bda 100644 17index d2d9c082..82270ecf 100644
18--- a/dnf/cli/cli.py 18--- a/dnf/cli/cli.py
19+++ b/dnf/cli/cli.py 19+++ b/dnf/cli/cli.py
20@@ -881,7 +881,7 @@ class Cli(object): 20@@ -920,7 +920,7 @@ class Cli(object):
21 subst = conf.substitutions 21 logger.warning(_("Unable to detect release version (use '--releasever' to specify "
22 subst.update_from_etc(conf.installroot) 22 "release version)"))
23 23
24- for opt in ('cachedir', 'logdir', 'persistdir'): 24- for opt in ('cachedir', 'logdir', 'persistdir'):
25+ for opt in ('cachedir', 'persistdir'): 25+ for opt in ('cachedir', 'persistdir'):
@@ -27,5 +27,5 @@ index b764801a..893f4bda 100644
27 27
28 self.base._logging._setup_from_dnf_conf(conf) 28 self.base._logging._setup_from_dnf_conf(conf)
29-- 29--
302.11.0 302.14.2
31 31
diff --git a/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
index 8c59f9f670..6e011915df 100644
--- a/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
+++ b/meta/recipes-devtools/dnf/dnf/0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch
@@ -1,16 +1,17 @@
1From 3ddaa930cda57a62a2174faebcc87aebc59591d1 Mon Sep 17 00:00:00 2001 1From 7205033e44d8fba1d3b18b490e7eaab82da1ffa3 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Dec 2016 18:29:07 +0200 3Date: Fri, 30 Dec 2016 18:29:07 +0200
4Subject: [PATCH 29/30] Do not set PYTHON_INSTALL_DIR by running python 4Subject: [PATCH 1/5] Do not set PYTHON_INSTALL_DIR by running python
5 5
6Upstream-Status: Inappropriate [oe-core specific] 6Upstream-Status: Inappropriate [oe-core specific]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8
8--- 9---
9 CMakeLists.txt | 2 +- 10 CMakeLists.txt | 2 +-
10 1 file changed, 1 insertion(+), 1 deletion(-) 11 1 file changed, 1 insertion(+), 1 deletion(-)
11 12
12diff --git a/CMakeLists.txt b/CMakeLists.txt 13diff --git a/CMakeLists.txt b/CMakeLists.txt
13index 6a319935..466ca1e6 100644 14index 23e5f889..650b624a 100644
14--- a/CMakeLists.txt 15--- a/CMakeLists.txt
15+++ b/CMakeLists.txt 16+++ b/CMakeLists.txt
16@@ -18,7 +18,7 @@ else() 17@@ -18,7 +18,7 @@ else()
@@ -23,5 +24,5 @@ index 6a319935..466ca1e6 100644
23 MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") 24 MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
24 25
25-- 26--
262.11.0 272.14.2
27 28
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 1abd880da9..eedbb5723f 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
@@ -1,19 +1,20 @@
1From 9c8d545152b35d8943be72b9503414a53e1ebf7c Mon Sep 17 00:00:00 2001 1From 8d97b72a1d77149e2f9048d1ca6cef66da1a8aa5 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Dec 2016 18:29:37 +0200 3Date: Fri, 30 Dec 2016 18:29:37 +0200
4Subject: [PATCH 30/30] Run python scripts using env 4Subject: [PATCH 2/5] Run python scripts using env
5 5
6Otherwise the build tools hardcode the python path into them. 6Otherwise the build tools hardcode the python path into them.
7 7
8Upstream-Status: Inappropriate [oe-core specific] 8Upstream-Status: Inappropriate [oe-core specific]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10
10--- 11---
11 bin/dnf-automatic.in | 2 +- 12 bin/dnf-automatic.in | 2 +-
12 bin/dnf.in | 2 +- 13 bin/dnf.in | 2 +-
13 2 files changed, 2 insertions(+), 2 deletions(-) 14 2 files changed, 2 insertions(+), 2 deletions(-)
14 15
15diff --git a/bin/dnf-automatic.in b/bin/dnf-automatic.in 16diff --git a/bin/dnf-automatic.in b/bin/dnf-automatic.in
16index 5b06aa26..9f6f703e 100755 17index 5b06aa26..891b4c24 100755
17--- a/bin/dnf-automatic.in 18--- a/bin/dnf-automatic.in
18+++ b/bin/dnf-automatic.in 19+++ b/bin/dnf-automatic.in
19@@ -1,4 +1,4 @@ 20@@ -1,4 +1,4 @@
@@ -23,7 +24,7 @@ index 5b06aa26..9f6f703e 100755
23 # 24 #
24 # Copyright (C) 2014-2016 Red Hat, Inc. 25 # Copyright (C) 2014-2016 Red Hat, Inc.
25diff --git a/bin/dnf.in b/bin/dnf.in 26diff --git a/bin/dnf.in b/bin/dnf.in
26index 645d0f06..ab141abd 100755 27index 645d0f06..bdf7b3c4 100755
27--- a/bin/dnf.in 28--- a/bin/dnf.in
28+++ b/bin/dnf.in 29+++ b/bin/dnf.in
29@@ -1,4 +1,4 @@ 30@@ -1,4 +1,4 @@
@@ -33,5 +34,5 @@ index 645d0f06..ab141abd 100755
33 # 34 #
34 # Copyright (C) 2012-2016 Red Hat, Inc. 35 # Copyright (C) 2012-2016 Red Hat, Inc.
35-- 36--
362.11.0 372.14.2
37 38
diff --git a/meta/recipes-devtools/dnf/dnf_2.6.3.bb b/meta/recipes-devtools/dnf/dnf_2.7.5.bb
index 3ed6a74570..fbd3bd4571 100644
--- a/meta/recipes-devtools/dnf/dnf_2.6.3.bb
+++ b/meta/recipes-devtools/dnf/dnf_2.7.5.bb
@@ -5,15 +5,14 @@ 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-Corretly-install-tmpfiles.d-configuration.patch \
9 file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \
10 file://0005-Do-not-prepend-installroot-to-logdir.patch \
8 file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ 11 file://0029-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \
9 file://0030-Run-python-scripts-using-env.patch \ 12 file://0030-Run-python-scripts-using-env.patch \
10 file://0001-Do-not-prepend-installroot-to-logdir.patch \
11 file://0001-Do-not-hardcode-etc-and-systemd-unit-directories.patch \
12 file://0001-Corretly-install-tmpfiles.d-configuration.patch \
13 file://0001-Check-conf.releasever-instead-of-releasever.patch \
14 " 13 "
15 14
16SRCREV = "be2585183ec4485ee4d5e121f242d8669296f065" 15SRCREV = "564c44667c7014843fa6f1732621093114ec59b2"
17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" 16UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)"
18 17
19S = "${WORKDIR}/git" 18S = "${WORKDIR}/git"
@@ -46,6 +45,7 @@ do_install_append_class-native() {
46} 45}
47 46
48SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \ 47SYSTEMD_SERVICE_${PN} = "dnf-makecache.service dnf-makecache.timer \
48 dnf-automatic.service dnf-automatic.timer \
49 dnf-automatic-download.service dnf-automatic-download.timer \ 49 dnf-automatic-download.service dnf-automatic-download.timer \
50 dnf-automatic-install.service dnf-automatic-install.timer \ 50 dnf-automatic-install.service dnf-automatic-install.timer \
51 dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \ 51 dnf-automatic-notifyonly.service dnf-automatic-notifyonly.timer \