diff options
| author | Alexander Kanavin <alexander.kanavin@linux.intel.com> | 2017-10-04 17:18:17 +0300 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-12-21 16:26:55 +0000 |
| commit | 564ae957b81911bb69315f230a9757a303deec0a (patch) | |
| tree | 46dd704e95ed1ecb54cd4bcdc2edc9b8832a291b | |
| parent | b4613b6ce07c295c5d6de6861acf19315acaccb2 (diff) | |
| download | openembedded-core-564ae957b81911bb69315f230a9757a303deec0a.tar.gz openembedded-core-564ae957b81911bb69315f230a9757a303deec0a.tar.bz2 openembedded-core-564ae957b81911bb69315f230a9757a303deec0a.zip | |
libdnf: update to 0.11.1
Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
| -rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch | 11 | ||||
| -rw-r--r-- | meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch | 11 | ||||
| -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 @@ -From 3012a93745223751cc979e3770207a09a075bec6 Mon Sep 17 00:00:00 2001 +From 2bf0666544293dcfac2f67b678e24353acdcd4e7 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 5/5] Get parameters for both libsolv and libsolvext (libdnf is +Subject: [PATCH 2/2] Get parameters for both libsolv and libsolvext (libdnf is + using both) Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] @@ -12,12 +13,12 @@ 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 8b2ab9a..e2d33d7 100644 +index ca280f3..6ab9827 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,7 @@ find_package (PkgConfig REQUIRED) SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) - PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED) + PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED) FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) -PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext) @@ -25,5 +26,5 @@ index 8b2ab9a..e2d33d7 100644 if (ENABLE_RHSM_SUPPORT) pkg_check_modules (RHSM REQUIRED librhsm) -- -2.11.0 +2.14.2 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 @@ -From 55cbe6f40fe0836385e1a7241ec811cbe99e5840 Mon Sep 17 00:00:00 2001 +From bcea5c5063a2d5f07dbe6f40aee30370fc4ba656 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 4/5] Set libsolv variables with pkg-config (cmake's own module +Subject: [PATCH 1/2] Set libsolv variables with pkg-config (cmake's own module + doesn't work properly). Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312] @@ -12,12 +13,12 @@ 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 a75df04..8b2ab9a 100644 +index 8875bbf..ca280f3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -29,7 +29,8 @@ find_package (PkgConfig REQUIRED) SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) - PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.44.0 REQUIRED) + PKG_CHECK_MODULES(GLIB gio-unix-2.0>=2.46.0 REQUIRED) FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) -find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext) +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) @@ -26,5 +27,5 @@ index a75df04..8b2ab9a 100644 pkg_check_modules (RHSM REQUIRED librhsm) include_directories (${RHSM_INCLUDE_DIRS}) -- -2.11.0 +2.14.2 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 \ file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ " -SRCREV = "1b19950e82d88eec28d01b4e7c1da712c941201d" +SRCREV = "60f979bd8db651229c559c1412f1eb880257127d" S = "${WORKDIR}/git" |