summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/librepo
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2021-06-17 08:11:01 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-06-17 22:20:44 +0100
commit50999ca5fadd8a9fabe542c438cd23433943edd6 (patch)
treeb72661de1e5b5d82b519eb190095f449b1ccf4c9 /meta/recipes-devtools/librepo
parent63d38f0f5a2024af53ff082ee5968a4cdc180aea (diff)
downloadpoky-50999ca5fadd8a9fabe542c438cd23433943edd6.tar.gz
librepo: upgrade 1.14.0 -> 1.14.1
refresh 0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch (From OE-Core rev: 2d3c4ccaf429e64f3cbd41974c5bed1512c9d435) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/librepo')
-rw-r--r--meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch15
-rw-r--r--meta/recipes-devtools/librepo/librepo_1.14.1.bb (renamed from meta/recipes-devtools/librepo/librepo_1.14.0.bb)2
2 files changed, 10 insertions, 7 deletions
diff --git a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch
index 46ab9a1132..2ea50f00ff 100644
--- a/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch
+++ b/meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch
@@ -5,13 +5,13 @@ Subject: [PATCH] Do not try to obtain 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 8Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
9--- 9---
10 librepo/python/CMakeLists.txt | 12 ++++++------ 10 librepo/python/CMakeLists.txt | 12 ++++++------
11 1 file changed, 6 insertions(+), 6 deletions(-) 11 1 file changed, 6 insertions(+), 6 deletions(-)
12 12
13diff --git a/librepo/python/CMakeLists.txt b/librepo/python/CMakeLists.txt 13diff --git a/librepo/python/CMakeLists.txt b/librepo/python/CMakeLists.txt
14index 52fc39e..2024407 100644 14index 8523ca7..06e5f7b 100644
15--- a/librepo/python/CMakeLists.txt 15--- a/librepo/python/CMakeLists.txt
16+++ b/librepo/python/CMakeLists.txt 16+++ b/librepo/python/CMakeLists.txt
17@@ -16,12 +16,12 @@ SET (librepomodule_SRCS 17@@ -16,12 +16,12 @@ SET (librepomodule_SRCS
@@ -20,16 +20,19 @@ index 52fc39e..2024407 100644
20 20
21-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " 21-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
22-from sys import stdout 22-from sys import stdout
23-from distutils import sysconfig 23-from sysconfig import get_path
24-path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}') 24-path=get_path(name='platlib', vars={'platbase':'${CMAKE_INSTALL_PREFIX}'})
25-stdout.write(path)" 25-stdout.write(path)"
26-OUTPUT_VARIABLE PYTHON_INSTALL_DIR) 26-OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
27+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c " 27+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
28+#from sys import stdout 28+#from sys import stdout
29+#from distutils import sysconfig 29+#from sysconfig import get_path
30+#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}') 30+#path=get_path(name='platlib', vars={'platbase':'${CMAKE_INSTALL_PREFIX}'})
31+#stdout.write(path)" 31+#stdout.write(path)"
32+#OUTPUT_VARIABLE PYTHON_INSTALL_DIR) 32+#OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
33 INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) 33 INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
34 34
35 MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}") 35 MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}")
36--
372.25.1
38
diff --git a/meta/recipes-devtools/librepo/librepo_1.14.0.bb b/meta/recipes-devtools/librepo/librepo_1.14.1.bb
index 109b40ce3d..8676452587 100644
--- a/meta/recipes-devtools/librepo/librepo_1.14.0.bb
+++ b/meta/recipes-devtools/librepo/librepo_1.14.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/rpm-software-management/librepo.git \
10 file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ 10 file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
11 " 11 "
12 12
13SRCREV = "88b769eceefc1b151937e6b54d108b48f2177d87" 13SRCREV = "c5fe6b85b47f2e4f7a37cff3f3214205d1b54db5"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16