diff options
author | wangmy <wangmy@fujitsu.com> | 2022-03-15 19:22:17 +0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-03-16 10:27:22 +0000 |
commit | a5df953824474dfcb99ee3da305c11e2b178eeb5 (patch) | |
tree | e3e2dc874f213ce81e71b2598628ed685c2f9bf7 | |
parent | 6a668a01c6502ba9e27c1d181b013284bfec4660 (diff) | |
download | openembedded-core-contrib-a5df953824474dfcb99ee3da305c11e2b178eeb5.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()
Signed-off-by: Wang Mingyu <wangmy@fujitsu.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0001-Add-WITH_TESTS-option.patch | 49 | ||||
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch | 4 | ||||
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch | 42 | ||||
-rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch | 10 | ||||
-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 @@ -From 7d60d62b5c5374156703ca7262fb2f85ec5db119 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 6 Nov 2018 13:54:43 +0100 -Subject: [PATCH] Add WITH_TESTS option - -This makes a dependency on cppunit optional. - -Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1382] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - ---- - CMakeLists.txt | 3 +++ - python/hawkey/CMakeLists.txt | 2 ++ - 2 files changed, 5 insertions(+) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 9c6e1b2f..8599c540 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -33,6 +33,7 @@ option(WITH_MAN "Enables hawkey man page generation" ON) - option(WITH_ZCHUNK "Build with zchunk support" ON) - option(ENABLE_RHSM_SUPPORT "Build with Red Hat Subscription Manager support?" OFF) - option(ENABLE_SOLV_URPMREORDER "Build with support for URPM-like solution reordering?" OFF) -+option(WITH_TESTS "Enables unit tests" ON) - - - # build options - debugging -@@ -179,8 +180,10 @@ endif() - - - # build tests -+IF (WITH_TESTS) - enable_testing() - add_subdirectory(tests) -+ENDIF() - if(WITH_BINDINGS) - add_subdirectory(python/hawkey) - endif() -diff --git a/python/hawkey/CMakeLists.txt b/python/hawkey/CMakeLists.txt -index d9645346..84d17204 100644 ---- a/python/hawkey/CMakeLists.txt -+++ b/python/hawkey/CMakeLists.txt -@@ -50,4 +50,6 @@ target_link_libraries(_hawkeymodule ${PYTHON_LIBRARY}) - install(FILES __init__.py DESTINATION ${PYTHON_INSTALL_DIR}/hawkey) - install(TARGETS _hawkeymodule LIBRARY DESTINATION ${PYTHON_INSTALL_DIR}/hawkey) - -+IF (WITH_TESTS) - add_subdirectory(tests) -+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 index b722d4fb..ce88b9e3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -45,7 +45,7 @@ endif() +@@ -52,7 +52,7 @@ endif() # build dependencies find_package(Gpgme REQUIRED) -PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext) set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) - find_package(OpenSSL REQUIRED) + 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 @@ -From b570c7f8bd089deec7da2b108aa789a27025a473 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin <alex.kanavin@gmail.com> -Date: Tue, 19 Nov 2019 13:46:09 +0100 -Subject: [PATCH] Look fo sphinx only if documentation is actually enabled - -Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/1383] -Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> ---- - docs/hawkey/CMakeLists.txt | 20 +++++++++++--------- - 1 file changed, 11 insertions(+), 9 deletions(-) - -diff --git a/docs/hawkey/CMakeLists.txt b/docs/hawkey/CMakeLists.txt -index 52cc35c6..63c7672f 100644 ---- a/docs/hawkey/CMakeLists.txt -+++ b/docs/hawkey/CMakeLists.txt -@@ -2,15 +2,17 @@ - # tell sphinx-build to do them both in one go: - - --find_program(SPHINX_PROGRAM NAMES "sphinx-build-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") --if(NOT EXISTS ${SPHINX_PROGRAM}) -- find_program(SPHINX_PROGRAM NAMES sphinx-build-${PYTHON_VERSION_MAJOR}) --endif() --if(NOT EXISTS ${SPHINX_PROGRAM}) -- find_program(SPHINX_PROGRAM NAMES sphinx-build) --endif() --if(NOT EXISTS ${SPHINX_PROGRAM}) -- message(FATAL_ERROR "Sphinx program not found." ) -+if (WITH_HTML OR WITH_MAN) -+ find_program(SPHINX_PROGRAM NAMES "sphinx-build-${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}") -+ if(NOT EXISTS ${SPHINX_PROGRAM}) -+ find_program(SPHINX_PROGRAM NAMES sphinx-build-${PYTHON_VERSION_MAJOR}) -+ endif() -+ if(NOT EXISTS ${SPHINX_PROGRAM}) -+ find_program(SPHINX_PROGRAM NAMES sphinx-build) -+ endif() -+ if(NOT EXISTS ${SPHINX_PROGRAM}) -+ message(FATAL_ERROR "Sphinx program not found." ) -+ endif() - endif() - - 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 Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> - --- CMakeLists.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 16b63308..b722d4fb 100644 +index fd6e3f0..5383744 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -45,7 +45,8 @@ endif() +@@ -52,7 +52,8 @@ endif() # build dependencies find_package(Gpgme REQUIRED) -find_package(LibSolv 0.6.30 REQUIRED COMPONENTS ext) +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) +set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) - find_package(OpenSSL REQUIRED) + # build dependencies via pkg-config +-- +2.25.1 + 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 file://0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch \ file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \ file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ - file://0001-Add-WITH_TESTS-option.patch \ - file://0001-Look-fo-sphinx-only-if-documentation-is-actually-ena.patch \ file://enable_test_data_dir_set.patch \ file://0001-drop-FindPythonInstDir.cmake.patch \ file://0001-libdnf-dnf-context.cpp-do-not-try-to-access-BDB-data.patch \ " -SRCREV = "cee3e1c59f849d9be1bb8d7db3090cea5c59f4b6" +SRCREV = "add5d5418b140a86d08667dd2b14793093984875" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" S = "${WORKDIR}/git" |