mirror of
https://git.yoctoproject.org/poky
synced 2026-02-20 08:29:42 +01:00
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>
This commit is contained in:
wangmy
@@ -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()
|
||||
@@ -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)
|
||||
|
||||
|
||||
|
||||
@@ -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)
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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"
|
||||
Reference in New Issue
Block a user