summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-10-04 17:18:17 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-01-02 17:24:37 +0000
commit49029c2248ce71bb3a0928fc1f77e7d0ad6c5a0d (patch)
tree3122c4f7c663add73721d147df54b5b63a4e6733
parent0ac5ca3fcf60d42337ea62c3006f3787a7978131 (diff)
downloadpoky-49029c2248ce71bb3a0928fc1f77e7d0ad6c5a0d.tar.gz
libdnf: update to 0.11.1
(From OE-Core rev: 564ae957b81911bb69315f230a9757a303deec0a) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch11
-rw-r--r--meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch11
-rw-r--r--meta/recipes-devtools/libdnf/libdnf_0.11.1.bb (renamed from meta/recipes-devtools/libdnf/libdnf_0.9.3.bb)2
3 files changed, 13 insertions, 11 deletions
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 280edb7a65..cbd0362c8b 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
@@ -1,7 +1,8 @@
1From 3012a93745223751cc979e3770207a09a075bec6 Mon Sep 17 00:00:00 2001 1From 2bf0666544293dcfac2f67b678e24353acdcd4e7 Mon Sep 17 00:00:00 2001
2From: Alexander Kanavin <alex.kanavin@gmail.com> 2From: Alexander Kanavin <alex.kanavin@gmail.com>
3Date: Tue, 7 Feb 2017 12:16:03 +0200 3Date: Tue, 7 Feb 2017 12:16:03 +0200
4Subject: [PATCH 5/5] Get parameters for both libsolv and libsolvext (libdnf is 4Subject: [PATCH 2/2] Get parameters for both libsolv and libsolvext (libdnf is
5
5 using both) 6 using both)
6 7
7Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] 8Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312]
@@ -12,12 +13,12 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
12 1 file changed, 1 insertion(+), 1 deletion(-) 13 1 file changed, 1 insertion(+), 1 deletion(-)
13 14
14diff --git a/CMakeLists.txt b/CMakeLists.txt 15diff --git a/CMakeLists.txt b/CMakeLists.txt
15index 8b2ab9a..e2d33d7 100644 16index ca280f3..6ab9827 100644
16--- a/CMakeLists.txt 17--- a/CMakeLists.txt
17+++ b/CMakeLists.txt 18+++ b/CMakeLists.txt
18@@ -29,7 +29,7 @@ find_package (PkgConfig REQUIRED) 19@@ -29,7 +29,7 @@ find_package (PkgConfig REQUIRED)
19 SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) 20 SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
20 PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED) 21 PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED)
21 FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) 22 FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
22-PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) 23-PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
23+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext) 24+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext)
@@ -25,5 +26,5 @@ index 8b2ab9a..e2d33d7 100644
25 if (ENABLE_RHSM_SUPPORT) 26 if (ENABLE_RHSM_SUPPORT)
26 pkg_check_modules (RHSM REQUIRED librhsm) 27 pkg_check_modules (RHSM REQUIRED librhsm)
27-- 28--
282.11.0 292.14.2
29 30
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 1ea9310893..6cf48a49f3 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,7 +1,8 @@
1From 55cbe6f40fe0836385e1a7241ec811cbe99e5840 Mon Sep 17 00:00:00 2001 1From bcea5c5063a2d5f07dbe6f40aee30370fc4ba656 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 4/5] Set libsolv variables with pkg-config (cmake's own module 4Subject: [PATCH 1/2] Set libsolv variables with pkg-config (cmake's own module
5
5 doesn't work properly). 6 doesn't work properly).
6 7
7Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] 8Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312]
@@ -12,12 +13,12 @@ Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
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 a75df04..8b2ab9a 100644 16index 8875bbf..ca280f3 100644
16--- a/CMakeLists.txt 17--- a/CMakeLists.txt
17+++ b/CMakeLists.txt 18+++ b/CMakeLists.txt
18@@ -29,7 +29,8 @@ find_package (PkgConfig REQUIRED) 19@@ -29,7 +29,8 @@ find_package (PkgConfig REQUIRED)
19 SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) 20 SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules)
20 PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED) 21 PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED)
21 FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) 22 FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
22-find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext) 23-find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext)
23+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) 24+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
@@ -26,5 +27,5 @@ index a75df04..8b2ab9a 100644
26 pkg_check_modules (RHSM REQUIRED librhsm) 27 pkg_check_modules (RHSM REQUIRED librhsm)
27 include_directories (${RHSM_INCLUDE_DIRS}) 28 include_directories (${RHSM_INCLUDE_DIRS})
28-- 29--
292.11.0 302.14.2
30 31
diff --git a/meta/recipes-devtools/libdnf/libdnf_0.9.3.bb b/meta/recipes-devtools/libdnf/libdnf_0.11.1.bb
index 01d9346d9a..4fc1d6defe 100644
--- a/meta/recipes-devtools/libdnf/libdnf_0.9.3.bb
+++ b/meta/recipes-devtools/libdnf/libdnf_0.11.1.bb
@@ -10,7 +10,7 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \
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 " 11 "
12 12
13SRCREV = "1b19950e82d88eec28d01b4e7c1da712c941201d" 13SRCREV = "60f979bd8db651229c559c1412f1eb880257127d"
14 14
15S = "${WORKDIR}/git" 15S = "${WORKDIR}/git"
16 16