summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/libdnf
diff options
context:
space:
mode:
authorwangmy <wangmy@fujitsu.com>2022-03-15 19:22:17 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-03-16 10:31:41 +0000
commit9556937fba32cee5a8bad8393b5da752a7148495 (patch)
tree80ed652e82ec13b17645d4f7ce60767e317719e1 /meta/recipes-devtools/libdnf
parent80974fd763ed9836edb5c259a40e937e5983901d (diff)
downloadpoky-9556937fba32cee5a8bad8393b5da752a7148495.tar.gz
libdnf: upgrade 0.65.0 -> 0.66.0
0001-Add-WITH_TESTS-option.patch 0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch removed since they're included in 0.66.0 0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch 0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch modified for new version Changelog: ========= Use rpmdbCookie from librpm, remove hawkey.Sack._rpmdb_version Fix handling transaction id in resolveTransactionItemReason (RhBug:2010259,2053014) Remove deprecated assertions (RhBug:2027383) Skip rich deps for autodetection of unmet dependencies (RhBug:2033130, 2048394) Increase required rpm version since we use rpmdbCookie() (From OE-Core rev: a5df953824474dfcb99ee3da305c11e2b178eeb5) Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/libdnf')
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch49
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch4
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch42
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch10
-rw-r--r--meta/recipes-devtools/libdnf/libdnf_0.66.0.bb (renamed from meta/recipes-devtools/libdnf/libdnf_0.65.0.bb)4
5 files changed, 9 insertions, 100 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
deleted file mode 100644
index 607995a394..0000000000
--- a/meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 7d60d62b5c5374156703ca7262fb2f85ec5db119 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 6 Nov 2018 13:54:43 +0100
4Subject: [PATCH] Add WITH_TESTS option
5
6This makes a dependency on cppunit optional.
7
8Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1382]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10
11---
12 CMakeLists.txt | 3 +++
13 python/hawkey/CMakeLists.txt | 2 ++
14 2 files changed, 5 insertions(+)
15
16diff --git a/CMakeLists.txt b/CMakeLists.txt
17index 9c6e1b2f..8599c540 100644
18--- a/CMakeLists.txt
19+++ b/CMakeLists.txt
20@@ -33,6 +33,7 @@ option(WITH_MAN "Enables hawkey man page generation" ON)
21 option(WITH_ZCHUNK "Build with zchunk support" 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)
25
26
27 # build options - debugging
28@@ -179,8 +180,10 @@ endif()
29
30
31 # build tests
32+IF (WITH_TESTS)
33 enable_testing()
34 add_subdirectory(tests)
35+ENDIF()
36 if(WITH_BINDINGS)
37 add_subdirectory(python/hawkey)
38 endif()
39diff --git a/python/hawkey/CMakeLists.txt b/python/hawkey/CMakeLists.txt
40index d9645346..84d17204 100644
41--- a/python/hawkey/CMakeLists.txt
42+++ b/python/hawkey/CMakeLists.txt
43@@ -50,4 +50,6 @@ target_link_libraries(_hawkeymodule ${PYTHON_LIBRARY})
44 install(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
45 install(TARGETS _hawkeymodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/hawkey)
46
47+IF (WITH_TESTS)
48 add_subdirectory(tests)
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 10450defbe..c7b2af89d1 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
@@ -16,12 +16,12 @@ diff --git a/CMakeLists.txt b/CMakeLists.txt
16index b722d4fb..ce88b9e3 100644 16index b722d4fb..ce88b9e3 100644
17--- a/CMakeLists.txt 17--- a/CMakeLists.txt
18+++ b/CMakeLists.txt 18+++ b/CMakeLists.txt
19@@ -45,7 +45,7 @@ endif() 19@@ -52,7 +52,7 @@ endif()
20 20
21 # build dependencies 21 # build dependencies
22 find_package(Gpgme REQUIRED) 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 find_package(OpenSSL REQUIRED) 26
27 27
diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch b/meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch
deleted file mode 100644
index 2d8213cc87..0000000000
--- a/meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch
+++ /dev/null
@@ -1,42 +0,0 @@
1From b570c7f8bd089deec7da2b108aa789a27025a473 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 19 Nov 2019 13:46:09 +0100
4Subject: [PATCH] Look fo sphinx only if documentation is actually enabled
5
6Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1383]
7Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
8---
9 docs/hawkey/CMakeLists.txt | 20 +++++++++++---------
10 1 file changed, 11 insertions(+), 9 deletions(-)
11
12diff --git a/docs/hawkey/CMakeLists.txt b/docs/hawkey/CMakeLists.txt
13index 52cc35c6..63c7672f 100644
14--- a/docs/hawkey/CMakeLists.txt
15+++ b/docs/hawkey/CMakeLists.txt
16@@ -2,15 +2,17 @@
17 # tell sphinx-build to do them both in one go:
18
19
20-find_program(SPHINX_PROGRAM NAMES "sphinx-build-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
21-if(NOT EXISTS ${SPHINX_PROGRAM})
22- find_program(SPHINX_PROGRAM NAMES sphinx-build-${PYTHON_VERSION_MAJOR})
23-endif()
24-if(NOT EXISTS ${SPHINX_PROGRAM})
25- find_program(SPHINX_PROGRAM NAMES sphinx-build)
26-endif()
27-if(NOT EXISTS ${SPHINX_PROGRAM})
28- message(FATAL_ERROR "Sphinx program not found." )
29+if (WITH_HTML OR WITH_MAN)
30+ find_program(SPHINX_PROGRAM NAMES "sphinx-build-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
31+ if(NOT EXISTS ${SPHINX_PROGRAM})
32+ find_program(SPHINX_PROGRAM NAMES sphinx-build-${PYTHON_VERSION_MAJOR})
33+ endif()
34+ if(NOT EXISTS ${SPHINX_PROGRAM})
35+ find_program(SPHINX_PROGRAM NAMES sphinx-build)
36+ endif()
37+ if(NOT EXISTS ${SPHINX_PROGRAM})
38+ message(FATAL_ERROR "Sphinx program not found." )
39+ endif()
40 endif()
41
42 if(WITH_HTML)
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 475c8f120b..9adb345b68 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
@@ -7,22 +7,24 @@ Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module
7 7
8Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] 8Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312]
9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> 9Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
10
11--- 10---
12 CMakeLists.txt | 3 ++- 11 CMakeLists.txt | 3 ++-
13 1 file changed, 2 insertions(+), 1 deletion(-) 12 1 file changed, 2 insertions(+), 1 deletion(-)
14 13
15diff --git a/CMakeLists.txt b/CMakeLists.txt 14diff --git a/CMakeLists.txt b/CMakeLists.txt
16index 16b63308..b722d4fb 100644 15index fd6e3f0..5383744 100644
17--- a/CMakeLists.txt 16--- a/CMakeLists.txt
18+++ b/CMakeLists.txt 17+++ b/CMakeLists.txt
19@@ -45,7 +45,8 @@ endif() 18@@ -52,7 +52,8 @@ endif()
20 19
21 # build dependencies 20 # build dependencies
22 find_package(Gpgme REQUIRED) 21 find_package(Gpgme REQUIRED)
23-find_package(LibSolv 0.6.30 REQUIRED COMPONENTS ext) 22-find_package(LibSolv 0.6.30 REQUIRED COMPONENTS ext)
24+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) 23+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
25+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) 24+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
26 find_package(OpenSSL REQUIRED)
27 25
28 26
27 # build dependencies via pkg-config
28--
292.25.1
30
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.66.0.bb
index 03c56e934a..1bfe901c8a 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.65.0.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.66.0.bb
@@ -8,14 +8,12 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p
8 file://0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch \ 8 file://0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch \
9 file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \ 9 file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \
10 file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ 10 file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
11 file://0001-Add-WITH_TESTS-option.patch \
12 file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \
13 file://enable_test_data_dir_set.patch \ 11 file://enable_test_data_dir_set.patch \
14 file://0001-drop-FindPythonInstDir.cmake.patch \ 12 file://0001-drop-FindPythonInstDir.cmake.patch \
15 file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \ 13 file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \
16 " 14 "
17 15
18SRCREV = "cee3e1c59f849d9be1bb8d7db3090cea5c59f4b6" 16SRCREV = "add5d5418b140a86d08667dd2b14793093984875"
19UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" 17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)"
20 18
21S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"