summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-04-15 12:54:45 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-04-16 11:10:02 +0100
commit8987cf8a11970698d85f59d726758782b9938c9f (patch)
tree786eb243f5ae03e2644f32e7ffbe604a5187dcb7
parent62d64f4441fbf28c1c48ad5e6d962b782c917bb5 (diff)
downloadpoky-8987cf8a11970698d85f59d726758782b9938c9f.tar.gz
libdnf: update to 0.28.1
Remove upstreamed 0001-include-missing-string-and-errno.h-headers.patch Rebase the other patches. (From OE-Core rev: b0c76d9b451ba10b97e9ecee7bbfc7158cab4152) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch44
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch16
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch65
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch20
-rw-r--r--meta/recipes-devtools/libdnf/libdnf_0.28.1.bb (renamed from meta/recipes-devtools/libdnf/libdnf_0.26.0.bb)3
5 files changed, 41 insertions, 107 deletions
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch
index 7c8131b4be..3c87d4d8b3 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch
@@ -1,4 +1,4 @@
1From 0d0155c4dd6c0b3305ea2ab0e10b0f84d024a6e1 Mon Sep 17 00:00:00 2001 1From e5a50db749b2b02e9e0cff9f7b639020e8ac76da Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 6 Nov 2018 13:54:43 +0100 3Date: Tue, 6 Nov 2018 13:54:43 +0100
4Subject: [PATCH] Add WITH_TESTS option 4Subject: [PATCH] Add WITH_TESTS option
@@ -14,36 +14,36 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
14 2 files changed, 5 insertions(+) 14 2 files changed, 5 insertions(+)
15 15
16diff --git a/CMakeLists.txt b/CMakeLists.txt 16diff --git a/CMakeLists.txt b/CMakeLists.txt
17index b73a03d7..a9e0200f 100644 17index ce88b9e3..7a99320a 100644
18--- a/CMakeLists.txt 18--- a/CMakeLists.txt
19+++ b/CMakeLists.txt 19+++ b/CMakeLists.txt
20@@ -36,6 +36,7 @@ OPTION(WITH_MAN "Enables hawkey man page generation" ON) 20@@ -32,6 +32,7 @@ option(WITH_HTML "Enables hawkey HTML generation" ON)
21 OPTION(WITH_HTML "Enables hawkey HTML generation" ON) 21 option(WITH_MAN "Enables hawkey man page generation" ON)
22 option(ENABLE_RHSM_SUPPORT "Build with Red Hat Subscription Manager support?" OFF)
23 option(ENABLE_SOLV_URPMREORDER "Build with support for URPM-like solution reordering?" OFF)
24+option(WITH_TESTS "Enables unit tests" ON)
22 25
23 OPTION(WITH_BINDINGS "Enables python/SWIG bindings" ON)
24+OPTION(WITH_TESTS "Enables unit tests" ON)
25 26
26 OPTION (ENABLE_SOLV_URPMREORDER "Build with support for URPM-like solution reordering?" OFF) 27 # load pkg-config first; it's required by other modules
27 option (ENABLE_RHSM_SUPPORT "Build with Red Hat Subscription Manager support?" OFF) 28@@ -158,8 +159,10 @@ endif()
28@@ -122,8 +123,10 @@ IF (WITH_BINDINGS) 29
29 # ADD_SUBDIRECTORY (bindings/perl) 30
30 ADD_SUBDIRECTORY (bindings/python) 31 # build tests
31 ENDIF()
32+IF (WITH_TESTS) 32+IF (WITH_TESTS)
33 ENABLE_TESTING() 33 enable_testing()
34 ADD_SUBDIRECTORY (tests) 34 add_subdirectory(tests)
35+ENDIF() 35+ENDIF()
36 IF (WITH_BINDINGS) 36 if(WITH_BINDINGS)
37 ADD_SUBDIRECTORY (python/hawkey) 37 add_subdirectory(python/hawkey)
38 ADD_SUBDIRECTORY (docs/hawkey) 38 endif()
39diff --git a/python/hawkey/CMakeLists.txt b/python/hawkey/CMakeLists.txt 39diff --git a/python/hawkey/CMakeLists.txt b/python/hawkey/CMakeLists.txt
40index 3c0b3c0c..31466ed9 100644 40index d9645346..84d17204 100644
41--- a/python/hawkey/CMakeLists.txt 41--- a/python/hawkey/CMakeLists.txt
42+++ b/python/hawkey/CMakeLists.txt 42+++ b/python/hawkey/CMakeLists.txt
43@@ -49,4 +49,6 @@ TARGET_LINK_LIBRARIES(_hawkeymodule ${PYTHON_LIBRARY}) 43@@ -50,4 +50,6 @@ target_link_libraries(_hawkeymodule ${PYTHON_LIBRARY})
44 INSTALL(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/hawkey) 44 install(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
45 INSTALL(TARGETS _hawkeymodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/hawkey) 45 install(TARGETS _hawkeymodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
46 46
47+IF (WITH_TESTS) 47+IF (WITH_TESTS)
48 ADD_SUBDIRECTORY(tests) 48 add_subdirectory(tests)
49+ENDIF() 49+ENDIF()
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
index 246db34154..10450defbe 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
@@ -1,4 +1,4 @@
1From c139a6c929cff93dbb9b8279e97263fc9e055727 Mon Sep 17 00:00:00 2001 1From 9294cd19e5e3121fb8d37b44ee82dd7c4b3ab2c7 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 7 Feb 2017 12:16:03 +0200 3Date: Tue, 7 Feb 2017 12:16:03 +0200
4Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is 4Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is
@@ -13,15 +13,15 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
14 14
15diff --git a/CMakeLists.txt b/CMakeLists.txt 15diff --git a/CMakeLists.txt b/CMakeLists.txt
16index cd91f08..6422534 100644 16index b722d4fb..ce88b9e3 100644
17--- a/CMakeLists.txt 17--- a/CMakeLists.txt
18+++ b/CMakeLists.txt 18+++ b/CMakeLists.txt
19@@ -46,7 +46,7 @@ endif(APPLE) 19@@ -45,7 +45,7 @@ endif()
20 PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED) 20
21 pkg_check_modules(SMARTCOLS REQUIRED smartcols) 21 # build dependencies
22 FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) 22 find_package(Gpgme REQUIRED)
23-PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) 23-PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
24+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext) 24+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext)
25 set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) 25 set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
26 if (ENABLE_RHSM_SUPPORT) 26 find_package(OpenSSL REQUIRED)
27 pkg_check_modules (RHSM REQUIRED librhsm>=0.0.3) 27
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch b/meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch
deleted file mode 100644
index 62de784820..0000000000
--- a/meta/recipes-devtools/libdnf/libdnf/0001-include-missing-string-and-errno.h-headers.patch
+++ /dev/null
@@ -1,65 +0,0 @@
1From ccc89ff0c1f8e55a4a22444d051925408f265df1 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 30 Jan 2019 10:32:11 -0800
4Subject: [PATCH] include missing <string> and errno.h headers
5
6This is unearthed when compiling with clang/libc++
7
8Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/677]
9
10Signed-off-by: Khem Raj <raj.khem@gmail.com>
11---
12 libdnf/conf/ConfigParser.hpp | 1 +
13 libdnf/module/modulemd/ModuleProfile.hpp | 1 +
14 libdnf/sack/changelog.hpp | 1 +
15 libdnf/utils/smartcols/Cell.hpp | 1 +
16 4 files changed, 4 insertions(+)
17
18diff --git a/libdnf/conf/ConfigParser.hpp b/libdnf/conf/ConfigParser.hpp
19index 97f25500..2a3851fa 100644
20--- a/libdnf/conf/ConfigParser.hpp
21+++ b/libdnf/conf/ConfigParser.hpp
22@@ -23,6 +23,7 @@
23
24 #include <map>
25 #include <stdexcept>
26+#include <string>
27 #include <utility>
28
29 namespace libdnf {
30diff --git a/libdnf/module/modulemd/ModuleProfile.hpp b/libdnf/module/modulemd/ModuleProfile.hpp
31index ab018deb..8d996ff4 100644
32--- a/libdnf/module/modulemd/ModuleProfile.hpp
33+++ b/libdnf/module/modulemd/ModuleProfile.hpp
34@@ -23,6 +23,7 @@
35
36
37 #include <memory>
38+#include <string>
39 #include <vector>
40
41 #include <modulemd/modulemd.h>
42diff --git a/libdnf/sack/changelog.hpp b/libdnf/sack/changelog.hpp
43index a3d3fc44..d830c414 100644
44--- a/libdnf/sack/changelog.hpp
45+++ b/libdnf/sack/changelog.hpp
46@@ -23,6 +23,7 @@
47 #define __CHANGELOG_HPP
48
49 #include <ctime>
50+#include <string>
51
52 namespace libdnf {
53
54diff --git a/libdnf/utils/smartcols/Cell.hpp b/libdnf/utils/smartcols/Cell.hpp
55index 2e811dee..b90f0050 100644
56--- a/libdnf/utils/smartcols/Cell.hpp
57+++ b/libdnf/utils/smartcols/Cell.hpp
58@@ -22,6 +22,7 @@
59 #define LIBDNF_CELL_HPP
60
61 #include <libsmartcols/libsmartcols.h>
62+#include <cerrno>
63 #include <string>
64 #include <stdexcept>
65
diff --git a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
index 80b1ed7bf1..475c8f120b 100644
--- a/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
+++ b/meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
@@ -1,4 +1,4 @@
1From 2bcd0b9f6310bacdc554e077e85319a5e90e5ce0 Mon Sep 17 00:00:00 2001 1From 18c2c06017784cd641cc8a3deee5fc472008f7f4 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:24:50 +0200 3Date: Fri, 30 Dec 2016 18:24:50 +0200
4Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module 4Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module
@@ -13,16 +13,16 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
13 1 file changed, 2 insertions(+), 1 deletion(-) 13 1 file changed, 2 insertions(+), 1 deletion(-)
14 14
15diff --git a/CMakeLists.txt b/CMakeLists.txt 15diff --git a/CMakeLists.txt b/CMakeLists.txt
16index 0b405cb..cd91f08 100644 16index 16b63308..b722d4fb 100644
17--- a/CMakeLists.txt 17--- a/CMakeLists.txt
18+++ b/CMakeLists.txt 18+++ b/CMakeLists.txt
19@@ -46,7 +46,8 @@ endif(APPLE) 19@@ -45,7 +45,8 @@ endif()
20 PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED) 20
21 pkg_check_modules(SMARTCOLS REQUIRED smartcols) 21 # build dependencies
22 FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) 22 find_package(Gpgme REQUIRED)
23-find_package (LibSolv 0.6.30 REQUIRED COMPONENTS ext) 23-find_package(LibSolv 0.6.30 REQUIRED COMPONENTS ext)
24+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) 24+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
25+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) 25+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
26 if (ENABLE_RHSM_SUPPORT) 26 find_package(OpenSSL REQUIRED)
27 pkg_check_modules (RHSM REQUIRED librhsm>=0.0.3) 27
28 include_directories (${RHSM_INCLUDE_DIRS}) 28
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.26.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
index 9c2247c237..4ff294c32c 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.26.0.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.28.1.bb
@@ -7,10 +7,9 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \
7 file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \ 7 file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \
8 file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ 8 file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
9 file://0001-Add-WITH_TESTS-option.patch \ 9 file://0001-Add-WITH_TESTS-option.patch \
10 file://0001-include-missing-string-and-errno.h-headers.patch \
11 " 10 "
12 11
13SRCREV = "bd23204aa83d10e3d293a9f2d496cba6070f6a4d" 12SRCREV = "751f89045b80d58c0d05800f74357cf78cdf7e77"
14 13
15S = "${WORKDIR}/git" 14S = "${WORKDIR}/git"
16 15