diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2018-11-21 14:57:25 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2018-11-22 12:02:57 +0000 |
commit | 33dbdd91cf327b3ef4c3ce484fc746c31876b706 (patch) | |
tree | 31fd284ab914986d2ddc7d69658593cef06e21f5 /meta/recipes-devtools/dnf/dnf | |
parent | 4603f83e23a0c6aa105cca71236e3697eea59587 (diff) | |
download | poky-33dbdd91cf327b3ef4c3ce484fc746c31876b706.tar.gz |
dnf: update to 4.0.4
License-Update: spelling fixes
(From OE-Core rev: f03c0f06e14d18a5ed263e943e36920d70796db9)
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/dnf/dnf')
2 files changed, 15 insertions, 21 deletions
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 15a7bfc732..cb09f17a56 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,7 +1,7 @@ | |||
1 | From a8ef81c115a45f05dad145c98e10f3c4940e4e29 Mon Sep 17 00:00:00 2001 | 1 | From ffb7942cc73c3d2c6aa7c689cdaf9bc0bcbc144b Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Thu, 26 Jan 2017 16:25:47 +0200 | 3 | Date: Thu, 26 Jan 2017 16:25:47 +0200 |
4 | Subject: [PATCH 3/5] Do not hardcode /etc and systemd unit directories | 4 | Subject: [PATCH] Do not hardcode /etc and systemd unit directories |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
@@ -11,20 +11,17 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
11 | 1 file changed, 2 insertions(+), 2 deletions(-) | 11 | 1 file changed, 2 insertions(+), 2 deletions(-) |
12 | 12 | ||
13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
14 | index 650b624a..10199618 100644 | 14 | index 73552967..38cf4fbf 100644 |
15 | --- a/CMakeLists.txt | 15 | --- a/CMakeLists.txt |
16 | +++ b/CMakeLists.txt | 16 | +++ b/CMakeLists.txt |
17 | @@ -7,8 +7,8 @@ if (NOT PYTHON_DESIRED) | 17 | @@ -3,8 +3,8 @@ CMAKE_MINIMUM_REQUIRED (VERSION 2.4) |
18 | set (PYTHON_DESIRED "2") | 18 | |
19 | endif() | 19 | INCLUDE (${CMAKE_SOURCE_DIR}/VERSION.cmake) |
20 | 20 | ||
21 | -SET( SYSCONFDIR /etc) | 21 | -SET( SYSCONFDIR /etc) |
22 | -SET( SYSTEMD_DIR /usr/lib/systemd/system) | 22 | -SET( SYSTEMD_DIR /usr/lib/systemd/system) |
23 | +SET( SYSCONFDIR ${CMAKE_INSTALL_SYSCONFDIR}) | 23 | +SET( SYSCONFDIR ${CMAKE_INSTALL_SYSCONFDIR}) |
24 | +SET( SYSTEMD_DIR $ENV{systemd_system_unitdir}) | 24 | +SET( SYSTEMD_DIR $ENV{systemd_system_unitdir}) |
25 | 25 | ||
26 | if (${PYTHON_DESIRED} STREQUAL "2") | 26 | IF (NOT PYTHON_DESIRED) |
27 | FIND_PACKAGE (PythonInterp REQUIRED) | 27 | FIND_PACKAGE (PythonInterp REQUIRED) |
28 | -- | ||
29 | 2.14.2 | ||
30 | |||
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 6e011915df..0ed9afc58d 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,7 +1,7 @@ | |||
1 | From 7205033e44d8fba1d3b18b490e7eaab82da1ffa3 Mon Sep 17 00:00:00 2001 | 1 | From 6be13143a54c79085d400d5bd4c7a6e1cb6ffaf5 Mon Sep 17 00:00:00 2001 |
2 | From: Alexander Kanavin <alex.kanavin@gmail.com> | 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
3 | Date: Fri, 30 Dec 2016 18:29:07 +0200 | 3 | Date: Fri, 30 Dec 2016 18:29:07 +0200 |
4 | Subject: [PATCH 1/5] Do not set PYTHON_INSTALL_DIR by running python | 4 | Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python |
5 | 5 | ||
6 | Upstream-Status: Inappropriate [oe-core specific] | 6 | Upstream-Status: Inappropriate [oe-core specific] |
7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | 7 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
@@ -11,18 +11,15 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> | |||
11 | 1 file changed, 1 insertion(+), 1 deletion(-) | 11 | 1 file changed, 1 insertion(+), 1 deletion(-) |
12 | 12 | ||
13 | diff --git a/CMakeLists.txt b/CMakeLists.txt | 13 | diff --git a/CMakeLists.txt b/CMakeLists.txt |
14 | index 23e5f889..650b624a 100644 | 14 | index 38cf4fbf..6c5debd8 100644 |
15 | --- a/CMakeLists.txt | 15 | --- a/CMakeLists.txt |
16 | +++ b/CMakeLists.txt | 16 | +++ b/CMakeLists.txt |
17 | @@ -18,7 +18,7 @@ else() | 17 | @@ -19,7 +19,7 @@ ELSE () |
18 | FIND_PACKAGE(PythonInterp 3.0 REQUIRED) | 18 | MESSAGE (FATAL_ERROR "Invalid PYTHON_DESIRED value: " ${PYTHON_DESIRED}) |
19 | endif() | 19 | ENDIF() |
20 | 20 | ||
21 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) | 21 | -EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) |
22 | +#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) | 22 | +#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib())" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) |
23 | EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "import sys; sys.stdout.write('%s.%s' % (sys.version_info.major, sys.version_info.minor))" OUTPUT_VARIABLE PYTHON_MAJOR_DOT_MINOR_VERSION) | ||
24 | MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") | 23 | MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") |
25 | 24 | ||
26 | -- | 25 | ADD_SUBDIRECTORY (dnf) |
27 | 2.14.2 | ||
28 | |||