mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 12:49:46 +00:00
Code Issues Projects Releases Wiki Activity

libdnf: update to 0.8.1

Browse Source 
Rebase the patches.

(From OE-Core rev: de098813f3c94a96d69ea393e711eb682e29948e)

Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Alexander Kanavin
2017-04-21 15:39:56 +03:00
committed by Richard Purdie
parent c132ac3d15
commit 528abed7b1
3 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/recipes-devtools/libdnf/libdnf/0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch
+7 -6
View File
@@ -1,28 +1,29 @@
From 5958b151a4dbb89114e90c971a34b74f873b7beb Mon Sep 17 00:00:00 2001 From 3012a93745223751cc979e3770207a09a075bec6 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Tue, 7 Feb 2017 12:16:03 +0200 Date: Tue, 7 Feb 2017 12:16:03 +0200
Subject: [PATCH] Get parameters for both libsolv and libsolvext (libdnf is Subject: [PATCH 5/5] Get parameters for both libsolv and libsolvext (libdnf is
using both) using both)
Upstream-Status: Pending [depends on whether https://github.com/openSUSE/libsolv/pull/177 is accepted] Upstream-Status: Pending [depends on whether https://github.com/openSUSE/libsolv/pull/177 is accepted]
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
--- ---
CMakeLists.txt | 2 +- CMakeLists.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-) 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index b531da1..e512da0 100644 index 8b2ab9a..e2d33d7 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -28,7 +28,7 @@ find_package (PkgConfig REQUIRED) @@ -29,7 +29,7 @@ find_package (PkgConfig REQUIRED)
SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) 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.44.0 REQUIRED)
FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
-PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) -PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext) +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv libsolvext)
set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
pkg_check_modules (CHECK REQUIRED check) if (ENABLE_RHSM_SUPPORT)
pkg_check_modules (REPO REQUIRED librepo) pkg_check_modules (RHSM REQUIRED librhsm)
-- --
2.11.0 2.11.0
meta/recipes-devtools/libdnf/libdnf/0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch
+8 -7
View File
@@ -1,29 +1,30 @@
From 6d2718b925453f9a6915001f489606eb8e4086c8 Mon Sep 17 00:00:00 2001 From 55cbe6f40fe0836385e1a7241ec811cbe99e5840 Mon Sep 17 00:00:00 2001
From: Alexander Kanavin <alex.kanavin@gmail.com> From: Alexander Kanavin <alex.kanavin@gmail.com>
Date: Fri, 30 Dec 2016 18:24:50 +0200 Date: Fri, 30 Dec 2016 18:24:50 +0200
Subject: [PATCH 4/4] Set libsolv variables with pkg-config (cmake's own module Subject: [PATCH 4/5] Set libsolv variables with pkg-config (cmake's own module
doesn't work properly). doesn't work properly).
Upstream-Status: Pending Upstream-Status: Pending
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
--- ---
CMakeLists.txt | 3 ++- CMakeLists.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-) 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8edb627..b531da1 100644 index a75df04..8b2ab9a 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -28,7 +28,8 @@ find_package (PkgConfig REQUIRED) @@ -29,7 +29,8 @@ find_package (PkgConfig REQUIRED)
SET (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/modules) 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.44.0 REQUIRED)
FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb) FIND_LIBRARY (RPMDB_LIBRARY NAMES rpmdb)
-find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext) -find_package (LibSolv 0.6.21 REQUIRED COMPONENTS ext)
+PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv) +PKG_CHECK_MODULES (LIBSOLV REQUIRED libsolv)
+set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES}) +set(LIBSOLV_LIBRARY ${LIBSOLV_LIBRARIES})
pkg_check_modules (CHECK REQUIRED check) if (ENABLE_RHSM_SUPPORT)
pkg_check_modules (REPO REQUIRED librepo) pkg_check_modules (RHSM REQUIRED librhsm)
FIND_PROGRAM (VALGRIND_PROGRAM NAMES valgrind PATH /usr/bin /usr/local/bin) include_directories (${RHSM_INCLUDE_DIRS})
-- --
2.11.0 2.11.0
meta/recipes-devtools/libdnf/libdnf_git.bb
+2 -2
View File
@@ -10,8 +10,8 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf \
file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
" "
PV = "0.2.3+git${SRCPV}" PV = "0.8.1"
SRCREV = "367545629cc01a8e622890d89bd13d062ce60d7b" SRCREV = "233287f4f80e24a917d5f6a26967f54080ffa255"
S = "${WORKDIR}/git" S = "${WORKDIR}/git"