mirror of
https://git.yoctoproject.org/poky
synced 2026-04-22 15:32:14 +02:00
libdnf: update 0.70.1 -> 0.71.0
(From OE-Core rev: 45a698ec64b4f60bf99cc466f1f325f7aa49db3d) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
efddfa97a2
commit
1d3dcc5d71
@@ -1,4 +1,4 @@
|
||||
From 9294cd19e5e3121fb8d37b44ee82dd7c4b3ab2c7 Mon Sep 17 00:00:00 2001
|
||||
From b87ae6860ea44996b677ad1c4a9793720b77c67c Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Tue, 7 Feb 2017 12:16:03 +0200
|
||||
Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is
|
||||
@@ -13,15 +13,15 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b722d4fb..ce88b9e3 100644
|
||||
index e99b28d0..548a9137 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -52,7 +52,7 @@ endif()
|
||||
@@ -51,7 +51,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})
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From fbb181d25ad85778add7ed45b6aaf114e02d0f79 Mon Sep 17 00:00:00 2001
|
||||
From 0b8eceb9161711003cd25ab400cadde7c1601733 Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Fri, 30 Dec 2016 18:24:50 +0200
|
||||
Subject: [PATCH] Set libsolv variables with pkg-config (cmake's own module
|
||||
@@ -13,13 +13,13 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 405dc4e8..53837448 100644
|
||||
index 6444c374..e99b28d0 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -52,7 +52,8 @@ endif()
|
||||
@@ -51,7 +51,8 @@ endif()
|
||||
|
||||
|
||||
# build dependencies
|
||||
find_package(Gpgme REQUIRED)
|
||||
-find_package(LibSolv 0.7.21 REQUIRED COMPONENTS ext)
|
||||
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
|
||||
+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
libdnf: allow reproducible binary builds
|
||||
From dc83a79053597546b2b42fcf578f3a7727b13f3b Mon Sep 17 00:00:00 2001
|
||||
From: Joe Slater <joe.slater@windriver.com>
|
||||
Date: Wed, 22 Jul 2020 13:31:11 -0700
|
||||
Subject: [PATCH] libdnf: allow reproducible binary builds
|
||||
|
||||
Use a dummy directory for test data if not built WITH_TESTS. Allow for overriding
|
||||
TESTDATADIR, since the default is guaranteed to be wrong for target builds.
|
||||
@@ -7,11 +10,16 @@ Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
---
|
||||
CMakeLists.txt | 7 ++++++-
|
||||
1 file changed, 6 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 548a9137..c378e7d9 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -133,7 +133,12 @@ add_definitions(-DG_LOG_DOMAIN=\\"libdnf
|
||||
add_definitions(-D_FILE_OFFSET_BITS=64)
|
||||
@@ -132,7 +132,12 @@ add_definitions(-DGETTEXT_DOMAIN=\\"libdnf\\")
|
||||
add_definitions(-DG_LOG_DOMAIN=\\"libdnf\\")
|
||||
|
||||
# tests
|
||||
-add_definitions(-DTESTDATADIR=\\"${CMAKE_SOURCE_DIR}/data/tests\\")
|
||||
|
||||
@@ -12,7 +12,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p
|
||||
file://0001-drop-FindPythonInstDir.cmake.patch \
|
||||
"
|
||||
|
||||
SRCREV = "3b8e59ad8ed3a3eb736d8a2e16b4fc04313d1f12"
|
||||
SRCREV = "39098f39806becdc87cf93e03a49ae89a33e7ede"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
Reference in New Issue
Block a user