summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2022-05-05 07:05:36 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-05-05 21:17:38 +0100
commitc3bd8c738f1fd4eec03e5f157d7e0b2bcbda2903 (patch)
treea8309b31a7455fd072ed8552acbda5440e88bb4e
parent1deff800974eb7b0c6c093ae4acf7a1b63d5ba2c (diff)
downloadpoky-c3bd8c738f1fd4eec03e5f157d7e0b2bcbda2903.tar.gz
libdnf: update 0.66.0 -> 0.67.0
(From OE-Core rev: a0490d98789efb6b82ba5a7b64f4cc028a53c24d) Signed-off-by: Alexander Kanavin <alex@linutronix.de> Signed-off-by: Luca Ceresoli <luca.ceresoli@bootlin.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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.67.0.bb (renamed from meta/recipes-devtools/libdnf/libdnf_0.66.0.bb)2
2 files changed, 5 insertions, 7 deletions
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 9adb345b68..643a5f37b6 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 18c2c06017784cd641cc8a3deee5fc472008f7f4 Mon Sep 17 00:00:00 2001 1From fbb181d25ad85778add7ed45b6aaf114e02d0f79 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
@@ -7,24 +7,22 @@ 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
10--- 11---
11 CMakeLists.txt | 3 ++- 12 CMakeLists.txt | 3 ++-
12 1 file changed, 2 insertions(+), 1 deletion(-) 13 1 file changed, 2 insertions(+), 1 deletion(-)
13 14
14diff --git a/CMakeLists.txt b/CMakeLists.txt 15diff --git a/CMakeLists.txt b/CMakeLists.txt
15index fd6e3f0..5383744 100644 16index 405dc4e8..53837448 100644
16--- a/CMakeLists.txt 17--- a/CMakeLists.txt
17+++ b/CMakeLists.txt 18+++ b/CMakeLists.txt
18@@ -52,7 +52,8 @@ endif() 19@@ -52,7 +52,8 @@ endif()
19 20
20 # build dependencies 21 # build dependencies
21 find_package(Gpgme REQUIRED) 22 find_package(Gpgme REQUIRED)
22-find_package(LibSolv 0.6.30 REQUIRED COMPONENTS ext) 23-find_package(LibSolv 0.7.21 REQUIRED COMPONENTS ext)
23+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) 24+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
24+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) 25+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
25 26
26 27
27 # build dependencies via pkg-config 28 # build dependencies via pkg-config
28--
292.25.1
30
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.66.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.67.0.bb
index 2558f96851..69255c5a57 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.66.0.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.67.0.bb
@@ -13,7 +13,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p
13 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 \
14 " 14 "
15 15
16SRCREV = "add5d5418b140a86d08667dd2b14793093984875" 16SRCREV = "1742be5225b3a4928707696db8c69391def55f5a"
17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" 17UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)"
18 18
19S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"