Initial commit
This commit is contained in:
Your Name
+31
@@ -0,0 +1,31 @@
|
||||
From 9bb7630915c3e787732463a3e2064fe0e177101b Mon Sep 17 00:00:00 2001
|
||||
From: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
Date: Thu, 24 Nov 2016 14:33:07 +0200
|
||||
Subject: [PATCH 1/4] FindGtkDoc.cmake: drop the requirement for
|
||||
GTKDOC_SCANGOBJ_WRAPPER
|
||||
|
||||
For some reason cmake is not able to find it when building in openembedded,
|
||||
and it's bundled with the source code anyway.
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
---
|
||||
cmake/modules/FindGtkDoc.cmake | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/cmake/modules/FindGtkDoc.cmake b/cmake/modules/FindGtkDoc.cmake
|
||||
index 92b2cc7..39f34bd 100644
|
||||
--- a/cmake/modules/FindGtkDoc.cmake
|
||||
+++ b/cmake/modules/FindGtkDoc.cmake
|
||||
@@ -52,7 +52,7 @@ find_program(GTKDOC_MKHTML_EXE gtkdoc-mkhtml PATH "${GLIB_PREFIX}/bin")
|
||||
find_program(GTKDOC_FIXXREF_EXE gtkdoc-fixxref PATH "${GLIB_PREFIX}/bin")
|
||||
|
||||
find_package_handle_standard_args(GtkDoc
|
||||
- REQUIRED_VARS GTKDOC_SCAN_EXE GTKDOC_SCANGOBJ_EXE GTKDOC_SCANGOBJ_WRAPPER GTKDOC_MKDB_EXE GTKDOC_MKHTML_EXE GTKDOC_FIXXREF_EXE
|
||||
+ REQUIRED_VARS GTKDOC_SCAN_EXE GTKDOC_SCANGOBJ_EXE GTKDOC_MKDB_EXE GTKDOC_MKHTML_EXE GTKDOC_FIXXREF_EXE
|
||||
VERSION_VAR GtkDoc_VERSION)
|
||||
|
||||
# ::
|
||||
--
|
||||
2.11.0
|
||||
|
||||
+27
@@ -0,0 +1,27 @@
|
||||
From 9294cd19e5e3121fb8d37b44ee82dd7c4b3ab2c7 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
|
||||
|
||||
using both)
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index b722d4fb..ce88b9e3 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -52,7 +52,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})
|
||||
|
||||
|
||||
@@ -0,0 +1,42 @@
|
||||
From c0a465ccae395871ab10932975e37894220bc6a1 Mon Sep 17 00:00:00 2001
|
||||
From: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
Date: Tue, 1 Jun 2021 10:23:59 +0800
|
||||
Subject: [PATCH] drop FindPythonInstDir.cmake
|
||||
|
||||
Since commit [1] applied, PYTHON_INSTALL_DIR is not right
|
||||
on nativesdk build
|
||||
...
|
||||
|Building for python3
|
||||
|-- Python install dir is
|
||||
|tmp-glibc/work/x86_64-nativesdk-wrlinuxsdk-linux/nativesdk-libdnf/0.63.0-r0/
|
||||
recipe-sysroot-native/usr/lib/python3.9/site-packages
|
||||
...
|
||||
|
||||
Yocto manually set PYTHON_INSTALL_DIR from recipe, it is not
|
||||
necessary to call FindPythonInstDir.cmake which will override
|
||||
Yocto setting
|
||||
|
||||
[1] https://github.com/rpm-software-management/libdnf/commit/f1cffbfb9f338da827e233c2d8ac3a25a6a59a69
|
||||
|
||||
Upstream-Status: Inappropriate [Yocto specific]
|
||||
|
||||
Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
|
||||
---
|
||||
cmake/modules/FindPythonInstDir.cmake | 7 +------
|
||||
1 file changed, 1 insertion(+), 6 deletions(-)
|
||||
|
||||
diff --git a/cmake/modules/FindPythonInstDir.cmake b/cmake/modules/FindPythonInstDir.cmake
|
||||
index ed098ded..8b137891 100644
|
||||
--- a/cmake/modules/FindPythonInstDir.cmake
|
||||
+++ b/cmake/modules/FindPythonInstDir.cmake
|
||||
@@ -1,6 +1 @@
|
||||
-EXECUTE_PROCESS(COMMAND ${PYTHON_EXECUTABLE} -c "
|
||||
-from sys import stdout
|
||||
-from sysconfig import get_path
|
||||
-path=get_path(name='platlib', vars={'platbase':'${CMAKE_INSTALL_PREFIX}'})
|
||||
-stdout.write(path)"
|
||||
-OUTPUT_VARIABLE PYTHON_INSTALL_DIR)
|
||||
+
|
||||
--
|
||||
2.18.1
|
||||
|
||||
+28
@@ -0,0 +1,28 @@
|
||||
From fbb181d25ad85778add7ed45b6aaf114e02d0f79 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
|
||||
|
||||
doesn't work properly).
|
||||
|
||||
Upstream-Status: Submitted [https://github.com/rpm-software-management/libdnf/pull/312]
|
||||
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
|
||||
|
||||
---
|
||||
CMakeLists.txt | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 405dc4e8..53837448 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -52,7 +52,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})
|
||||
|
||||
|
||||
# build dependencies via pkg-config
|
||||
@@ -0,0 +1,26 @@
|
||||
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.
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
Signed-off-by: Joe Slater <joe.slater@windriver.com>
|
||||
|
||||
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -133,7 +133,12 @@ add_definitions(-DG_LOG_DOMAIN=\\"libdnf
|
||||
add_definitions(-D_FILE_OFFSET_BITS=64)
|
||||
|
||||
# tests
|
||||
-add_definitions(-DTESTDATADIR=\\"${CMAKE_SOURCE_DIR}/data/tests\\")
|
||||
+if(NOT WITH_TESTS)
|
||||
+ set(TEST_DATA_DIR "/notests")
|
||||
+elseif(NOT DEFINED TEST_DATA_DIR)
|
||||
+ set(TEST_DATA_DIR "${CMAKE_SOURCE_DIR}/data/tests")
|
||||
+endif()
|
||||
+add_definitions(-DTESTDATADIR=\\"${TEST_DATA_DIR}\\")
|
||||
|
||||
# librhsm
|
||||
if(ENABLE_RHSM_SUPPORT)
|
||||
@@ -0,0 +1,35 @@
|
||||
SUMMARY = "Library providing simplified C and Python API to libsolv"
|
||||
HOMEPAGE = "https://github.com/rpm-software-management/libdnf"
|
||||
DESCRIPTION = "This library provides a high level package-manager. It's core library of dnf, PackageKit and rpm-ostree. It's replacement for deprecated hawkey library which it contains inside and uses librepo under the hood."
|
||||
LICENSE = "LGPL-2.1-or-later"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c"
|
||||
|
||||
SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;protocol=https \
|
||||
file://0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch \
|
||||
file://0004-Set-libsolv-variables-with-pkg-config-cmake-s-own-mo.patch \
|
||||
file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \
|
||||
file://enable_test_data_dir_set.patch \
|
||||
file://0001-drop-FindPythonInstDir.cmake.patch \
|
||||
"
|
||||
|
||||
SRCREV = "3b8e59ad8ed3a3eb736d8a2e16b4fc04313d1f12"
|
||||
UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native util-linux"
|
||||
|
||||
inherit gtk-doc gobject-introspection cmake pkgconfig setuptools3-base
|
||||
|
||||
EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DWITH_MAN=OFF -DPYTHON_DESIRED=3 \
|
||||
${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DWITH_GIR=ON', '-DWITH_GIR=OFF', d)} \
|
||||
-DWITH_TESTS=OFF \
|
||||
-DWITH_ZCHUNK=OFF \
|
||||
-DWITH_HTML=OFF \
|
||||
"
|
||||
EXTRA_OECMAKE:append:class-native = " -DWITH_GIR=OFF"
|
||||
EXTRA_OECMAKE:append:class-nativesdk = " -DWITH_GIR=OFF"
|
||||
|
||||
BBCLASSEXTEND = "native nativesdk"
|
||||
SKIP_RECIPE[libdnf] ?= "${@bb.utils.contains('PACKAGE_CLASSES', 'package_rpm', '', 'Does not build without package_rpm in PACKAGE_CLASSES due disabled rpm support in libsolv', d)}"
|
||||
|
||||
Reference in New Issue
Block a user