summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/librepo
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-10-04 17:33:37 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-02 17:24:37 +0000
commit798a83865e3446c81e4af75e812f86af9db09bfe (patch)
treeebcfd42eeaa771ecbde7d7f407d59c5214e37438 /meta/recipes-devtools/librepo
parent49029c2248ce71bb3a0928fc1f77e7d0ad6c5a0d (diff)
downloadpoky-798a83865e3446c81e4af75e812f86af9db09bfe.tar.gz
librepo: update to 1.8.1
Drop upstreamed patches, rebase the PYTHON_INSTALL_DIR patch. (From OE-Core rev: 7b77824462edbdf978df5dd56bfeab78ac47bb6c) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.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/0001-Correctly-set-the-library-installation-directory.patch28
-rw-r--r--meta/recipes-devtools/librepo/librepo/0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch49
-rw-r--r--meta/recipes-devtools/librepo/librepo/0003-tests-fix-a-race-when-deleting-temporary-directories.patch41
-rw-r--r--meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch40
-rw-r--r--meta/recipes-devtools/librepo/librepo_1.8.1.bb (renamed from meta/recipes-devtools/librepo/librepo_git.bb)6
5 files changed, 36 insertions, 128 deletions
diff --git a/meta/recipes-devtools/librepo/librepo/0001-Correctly-set-the-library-installation-directory.patch b/meta/recipes-devtools/librepo/librepo/0001-Correctly-set-the-library-installation-directory.patch
deleted file mode 100644
index 08a58f1755..0000000000
--- a/meta/recipes-devtools/librepo/librepo/0001-Correctly-set-the-library-installation-directory.patch
+++ /dev/null
@@ -1,28 +0,0 @@
1From 36d87919223db9b054862ad38cdda8d9222a2bab Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Dec 2016 18:04:35 +0200
4Subject: [PATCH 1/4] Correctly set the library installation directory
5
6Upstream-Status: Submitted [https://github.com/rpm-software-management/librepo/pull/110]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 librepo/CMakeLists.txt | 3 ++-
10 1 file changed, 2 insertions(+), 1 deletion(-)
11
12diff --git a/librepo/CMakeLists.txt b/librepo/CMakeLists.txt
13index 2fe76d8..5026def 100644
14--- a/librepo/CMakeLists.txt
15+++ b/librepo/CMakeLists.txt
16@@ -60,7 +60,8 @@ CONFIGURE_FILE("version.h.in" "${CMAKE_CURRENT_SOURCE_DIR}/version.h" @ONLY)
17 IF (CMAKE_SIZEOF_VOID_P MATCHES "8")
18 SET (LIB_SUFFIX "64")
19 ENDIF (CMAKE_SIZEOF_VOID_P MATCHES "8")
20-SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
21+#SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
22+SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}")
23
24 INSTALL(FILES ${librepo_HEADERS} DESTINATION include/librepo)
25 INSTALL(TARGETS librepo LIBRARY DESTINATION ${LIB_INSTALL_DIR})
26--
272.11.0
28
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 7138dfce21..d69deb5110 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
@@ -1,41 +1,62 @@
1From 1570ad33dd7e5d83f3ee80bd104b114709ac1e34 Mon Sep 17 00:00:00 2001 1From 5b6849d9d7e030c3a521b5245d86f853b0271a61 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:05:36 +0200 3Date: Fri, 30 Dec 2016 18:05:36 +0200
4Subject: [PATCH 2/4] Do not try to obtain PYTHON_INSTALL_DIR by running 4Subject: [PATCH 1/2] Do not try to obtain PYTHON_INSTALL_DIR by running
5 python. 5 python.
6 6
7Upstream-Status: Inappropriate [oe-core specific] 7Upstream-Status: Inappropriate [oe-core specific]
8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 8Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
9
9--- 10---
10 librepo/python/python2/CMakeLists.txt | 2 +- 11 librepo/python/python2/CMakeLists.txt | 12 ++++++------
11 librepo/python/python3/CMakeLists.txt | 2 +- 12 librepo/python/python3/CMakeLists.txt | 12 ++++++------
12 2 files changed, 2 insertions(+), 2 deletions(-) 13 2 files changed, 12 insertions(+), 12 deletions(-)
13 14
14diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt 15diff --git a/librepo/python/python2/CMakeLists.txt b/librepo/python/python2/CMakeLists.txt
15index 3615e17..cffa99f 100644 16index 5ffbd62..90d3c22 100644
16--- a/librepo/python/python2/CMakeLists.txt 17--- a/librepo/python/python2/CMakeLists.txt
17+++ b/librepo/python/python2/CMakeLists.txt 18+++ b/librepo/python/python2/CMakeLists.txt
18@@ -1,6 +1,6 @@ 19@@ -1,11 +1,11 @@
19 FIND_PACKAGE (PythonLibs 2 ) 20 FIND_PACKAGE (PythonLibs 2 )
20 FIND_PACKAGE (PythonInterp 2 REQUIRED) 21 FIND_PACKAGE (PythonInterp 2 REQUIRED)
21-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) 22-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
22+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) 23-from sys import stdout
24-from distutils import sysconfig
25-path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
26-stdout.write(path)"
27-OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
28+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
29+#from sys import stdout
30+#from distutils import sysconfig
31+#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
32+#stdout.write(path)"
33+#OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
23 INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) 34 INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
24 35
25 MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}") 36 MESSAGE(STATUS "Python install dir is ${PYTHON_INSTALL_DIR}")
26diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt 37diff --git a/librepo/python/python3/CMakeLists.txt b/librepo/python/python3/CMakeLists.txt
27index dfecac9..38bcc72 100644 38index 47559f7..b39adc2 100644
28--- a/librepo/python/python3/CMakeLists.txt 39--- a/librepo/python/python3/CMakeLists.txt
29+++ b/librepo/python/python3/CMakeLists.txt 40+++ b/librepo/python/python3/CMakeLists.txt
30@@ -10,7 +10,7 @@ message("--- ${PYTHON_INCLUDE_DIR}") 41@@ -10,12 +10,12 @@ message("--- ${PYTHON_INCLUDE_DIR}")
31 42
32 FIND_PACKAGE(PythonLibs 3.0) 43 FIND_PACKAGE(PythonLibs 3.0)
33 FIND_PACKAGE(PythonInterp 3.0 REQUIRED) 44 FIND_PACKAGE(PythonInterp 3.0 REQUIRED)
34-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) 45-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
35+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "from sys import stdout; from distutils import sysconfig; stdout.write(sysconfig.get_python_lib(True))" OUTPUT_VARIABLE PYTHON_INSTALL_DIR) 46-from sys import stdout
47-from distutils import sysconfig
48-path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
49-stdout.write(path)"
50-OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
51+#EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
52+#from sys import stdout
53+#from distutils import sysconfig
54+#path=sysconfig.get_python_lib(True, prefix='${CMAKE_INSTALL_PREFIX}')
55+#stdout.write(path)"
56+#OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
36 INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH}) 57 INCLUDE_DIRECTORIES (${PYTHON_INCLUDE_PATH})
37 58
38 MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}") 59 MESSAGE(STATUS "Python3 install dir is ${PYTHON_INSTALL_DIR}")
39-- 60--
402.11.0 612.14.1
41 62
diff --git a/meta/recipes-devtools/librepo/librepo/0003-tests-fix-a-race-when-deleting-temporary-directories.patch b/meta/recipes-devtools/librepo/librepo/0003-tests-fix-a-race-when-deleting-temporary-directories.patch
deleted file mode 100644
index 89ca60e818..0000000000
--- a/meta/recipes-devtools/librepo/librepo/0003-tests-fix-a-race-when-deleting-temporary-directories.patch
+++ /dev/null
@@ -1,41 +0,0 @@
1From b1a5c92dbd1d11f1afdc094fccea64de334d2783 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Fri, 30 Dec 2016 18:06:24 +0200
4Subject: [PATCH 3/4] tests: fix a race when deleting temporary directories
5
6Upstream-Status: Submitted [https://github.com/rpm-software-management/librepo/pull/110]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 tests/python/tests/test_yum_repo_downloading.py | 2 +-
10 tests/python/tests/test_yum_repo_locating.py | 2 +-
11 2 files changed, 2 insertions(+), 2 deletions(-)
12
13diff --git a/tests/python/tests/test_yum_repo_downloading.py b/tests/python/tests/test_yum_repo_downloading.py
14index ad597dc..4a32519 100644
15--- a/tests/python/tests/test_yum_repo_downloading.py
16+++ b/tests/python/tests/test_yum_repo_downloading.py
17@@ -32,7 +32,7 @@ class TestCaseYumRepoDownloading(TestCaseWithFlask):
18 os.environ.pop('GNUPGHOME')
19 else:
20 os.environ['GNUPGHOME'] = self._gnupghome
21- shutil.rmtree(self.tmpdir)
22+ shutil.rmtree(self.tmpdir, True)
23
24 def test_download_repo_01(self):
25 h = librepo.Handle()
26diff --git a/tests/python/tests/test_yum_repo_locating.py b/tests/python/tests/test_yum_repo_locating.py
27index 8f4bea5..db4294c 100644
28--- a/tests/python/tests/test_yum_repo_locating.py
29+++ b/tests/python/tests/test_yum_repo_locating.py
30@@ -34,7 +34,7 @@ class TestCaseYumRepoLocating(TestCase):
31 os.environ.pop('GNUPGHOME')
32 else:
33 os.environ['GNUPGHOME'] = self._gnupghome
34- shutil.rmtree(self.tmpdir)
35+ shutil.rmtree(self.tmpdir, True)
36
37 def test_read_mirrorlist(self):
38 h = librepo.Handle()
39--
402.11.0
41
diff --git a/meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch b/meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch
deleted file mode 100644
index b0c7d1ca30..0000000000
--- a/meta/recipes-devtools/librepo/librepo/0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From a4bbbccce6edc1a2d1bd475506e2975fd7696c88 Mon Sep 17 00:00:00 2001
2From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Thu, 8 Jun 2017 16:31:30 +0800
4Subject: [PATCH] Fix typo: correct LRO_SSLVERIFYHOST with
5 CURLOPT_SSL_VERIFYHOST
6
7In commit 51d32c6cd88ba0139c32793183fd6a236c1ef456
8---
9Author: Tomas Mlcoch <tmlcoch@redhat.com>
10Date: Mon May 5 14:31:35 2014 +0200
11
12 Add LRO_SSLVERIFYPEER and LRO_SSLVERIFYHOST options (RhBug: 1093014)
13---
14
15It incorrectly setopt CURLOPT_SSL_VERIFYPEER for LRO_SSLVERIFYHOST.
16Use CURLOPT_SSL_VERIFYHOST to correct.
17
18Upstream-Status: Submitted
19
20Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
21---
22 librepo/handle.c | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/librepo/handle.c b/librepo/handle.c
26index ccea79b..ff39db4 100644
27--- a/librepo/handle.c
28+++ b/librepo/handle.c
29@@ -629,7 +629,7 @@ lr_handle_setopt(LrHandle *handle,
30
31 case LRO_SSLVERIFYHOST:
32 handle->sslverifyhost = va_arg(arg, long) ? 2 : 0;
33- c_rc = curl_easy_setopt(c_h, CURLOPT_SSL_VERIFYPEER, handle->sslverifyhost);
34+ c_rc = curl_easy_setopt(c_h, CURLOPT_SSL_VERIFYHOST, handle->sslverifyhost);
35 break;
36
37 case LRO_SSLCLIENTCERT:
38--
392.7.4
40
diff --git a/meta/recipes-devtools/librepo/librepo_git.bb b/meta/recipes-devtools/librepo/librepo_1.8.1.bb
index 3238b14fac..0324104a37 100644
--- a/meta/recipes-devtools/librepo/librepo_git.bb
+++ b/meta/recipes-devtools/librepo/librepo_1.8.1.bb
@@ -3,15 +3,11 @@ LICENSE = "LGPLv2.1"
3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" 3LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
4 4
5SRC_URI = "git://github.com/rpm-software-management/librepo.git \ 5SRC_URI = "git://github.com/rpm-software-management/librepo.git \
6 file://0001-Correctly-set-the-library-installation-directory.patch \
7 file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \ 6 file://0002-Do-not-try-to-obtain-PYTHON_INSTALL_DIR-by-running-p.patch \
8 file://0003-tests-fix-a-race-when-deleting-temporary-directories.patch \
9 file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \ 7 file://0004-Set-gpgme-variables-with-pkg-config-not-with-cmake-m.patch \
10 file://0005-Fix-typo-correct-LRO_SSLVERIFYHOST-with-CURLOPT_SSL_.patch \
11 " 8 "
12 9
13PV = "1.7.20+git${SRCPV}" 10SRCREV = "7b9b7bf388f3f059529c6f50c40b30919fef30f9"
14SRCREV = "e1137cbbda78fecb192146300790680a5bc811b1"
15 11
16S = "${WORKDIR}/git" 12S = "${WORKDIR}/git"
17 13