From patchwork Mon Sep 22 14:20:28 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 70691 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 39C24CAC5A8 for ; Mon, 22 Sep 2025 14:21:10 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.53333.1758550860983796837 for ; Mon, 22 Sep 2025 07:21:01 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 312971424 for ; Mon, 22 Sep 2025 07:20:52 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id ECB7F3F66E for ; Mon, 22 Sep 2025 07:20:59 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 1/4] libdnf: don't depend on libcheck Date: Mon, 22 Sep 2025 15:20:28 +0100 Message-ID: <20250922142031.3625684-1-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 22 Sep 2025 14:21:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/223826 Apply a patch to make libcheck optional, so we don't need to depend on it as we don't install the tests. Signed-off-by: Ross Burton --- .../libdnf/libdnf/optional-check.patch | 52 +++++++++++++++++++ meta/recipes-devtools/libdnf/libdnf_0.74.0.bb | 4 +- 2 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 meta/recipes-devtools/libdnf/libdnf/optional-check.patch diff --git a/meta/recipes-devtools/libdnf/libdnf/optional-check.patch b/meta/recipes-devtools/libdnf/libdnf/optional-check.patch new file mode 100644 index 00000000000..9228b0560f3 --- /dev/null +++ b/meta/recipes-devtools/libdnf/libdnf/optional-check.patch @@ -0,0 +1,52 @@ +From a4abd42a6b92f6aa16490c0f482bf08c4a6c2864 Mon Sep 17 00:00:00 2001 +From: Ross Burton +Date: Thu, 18 Sep 2025 11:23:33 +0100 +Subject: [PATCH] Move libcheck dependency to tests/ + +If we're not building the tests then there's no point in depending on +libcheck, so move the pkg_check_modules() call to tests/CMakeLists. + +Upstream-Status: Backport [https://github.com/rpm-software-management/libdnf/commit/6a127aec78d2ef837776e0e5a8e3636101a54ab0] +Signed-off-by: Ross Burton +--- + CMakeLists.txt | 1 - + tests/CMakeLists.txt | 7 +++---- + 2 files changed, 3 insertions(+), 5 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a489ea73..d1969899 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -59,7 +59,6 @@ find_package(LibSolv 0.7.21 REQUIRED COMPONENTS ext) + + + # build dependencies via pkg-config +-pkg_check_modules(CHECK REQUIRED check) + pkg_check_modules(GLIB REQUIRED gio-unix-2.0>=2.46.0) + include_directories(${GLIB_INCLUDE_DIRS}) + pkg_check_modules(JSONC REQUIRED json-c) +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index e4909682..78743f4e 100644 +--- a/tests/CMakeLists.txt ++++ b/tests/CMakeLists.txt +@@ -1,3 +1,6 @@ ++pkg_check_modules(CHECK REQUIRED check) ++pkg_check_modules(CPPUNIT REQUIRED cppunit) ++ + add_subdirectory(libdnf/conf) + add_subdirectory(libdnf/module/modulemd) + add_subdirectory(libdnf/module) +@@ -7,10 +10,6 @@ add_subdirectory(libdnf/sack) + add_subdirectory(hawkey) + add_subdirectory(libdnf) + +- +- +-pkg_check_modules(CPPUNIT REQUIRED cppunit) +- + set(LIBDNF_TEST_SOURCES + ${LIBDNF_TEST_SOURCES} + ${CMAKE_CURRENT_SOURCE_DIR}/run_tests.cpp +-- +2.43.0 + diff --git a/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb index 6ac518564b4..0dce8dc183b 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb @@ -11,12 +11,13 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p file://enable_test_data_dir_set.patch \ file://0001-drop-FindPythonInstDir.cmake.patch \ file://armarch.patch \ + file://optional-check.patch \ " SRCREV = "91a0bf9aada36a722855051526f012e0b5ab1af9" UPSTREAM_CHECK_GITTAGREGEX = "(?P(?!4\.90)\d+(\.\d+)+)" -DEPENDS = "glib-2.0 libsolv libcheck librepo rpm gtk-doc libmodulemd json-c swig-native util-linux" +DEPENDS = "glib-2.0 libsolv librepo rpm gtk-doc libmodulemd json-c swig-native util-linux" inherit gtk-doc gobject-introspection cmake pkgconfig setuptools3-base @@ -31,4 +32,3 @@ 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)}" - From patchwork Mon Sep 22 14:20:29 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 70693 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70386CAC5AD for ; Mon, 22 Sep 2025 14:21:10 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web10.53221.1758550861503459510 for ; Mon, 22 Sep 2025 07:21:01 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id CA31F236D for ; Mon, 22 Sep 2025 07:20:52 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 959E13F66E for ; Mon, 22 Sep 2025 07:21:00 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 2/4] libdnf: remove obsolete gobject-introspection support Date: Mon, 22 Sep 2025 15:20:29 +0100 Message-ID: <20250922142031.3625684-2-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250922142031.3625684-1-ross.burton@arm.com> References: <20250922142031.3625684-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 22 Sep 2025 14:21:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/223827 The intention to remove G-I support was stated in [1] and the last few pieces removed in [2], which were part of 0.15.0. [1] libdnf a4abd42a ("Move libcheck dependency to tests/") [2] libdnf e2f2862b ("[swdb]: C++ implementation with SWIG bindings.") Signed-off-by: Ross Burton --- meta/recipes-devtools/libdnf/libdnf_0.74.0.bb | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb index 0dce8dc183b..aa9e18e763f 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb @@ -19,16 +19,12 @@ UPSTREAM_CHECK_GITTAGREGEX = "(?P(?!4\.90)\d+(\.\d+)+)" DEPENDS = "glib-2.0 libsolv librepo rpm gtk-doc libmodulemd json-c swig-native util-linux" -inherit gtk-doc gobject-introspection cmake pkgconfig setuptools3-base +inherit gtk-doc 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)}" From patchwork Mon Sep 22 14:20:30 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 70694 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56650CAC592 for ; Mon, 22 Sep 2025 14:21:10 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.53335.1758550862249882136 for ; Mon, 22 Sep 2025 07:21:02 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 705061424 for ; Mon, 22 Sep 2025 07:20:53 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 3D5C03F66E for ; Mon, 22 Sep 2025 07:21:01 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 3/4] libdnf: remove non-functional gtk-doc support Date: Mon, 22 Sep 2025 15:20:30 +0100 Message-ID: <20250922142031.3625684-3-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250922142031.3625684-1-ross.burton@arm.com> References: <20250922142031.3625684-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 22 Sep 2025 14:21:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/223828 The gtk-doc integration doesn't actually work, as it isn't built by default and the targets need to be triggered manually. As clearly nobody was using it, and upstream appears to prefer doxygen for API documentation, remove the gtk-doc support. This also means adding gettext to the dependencies, as this was being pulled in via gtk-doc before but is actually needed for the translations. Signed-off-by: Ross Burton --- ...-drop-the-requirement-for-GTKDOC_SCA.patch | 28 ------------------- meta/recipes-devtools/libdnf/libdnf_0.74.0.bb | 11 ++++---- 2 files changed, 6 insertions(+), 33 deletions(-) delete mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch diff --git a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch b/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch deleted file mode 100644 index 0bd5eeb1dae..00000000000 --- a/meta/recipes-devtools/libdnf/libdnf/0001-FindGtkDoc.cmake-drop-the-requirement-for-GTKDOC_SCA.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 45d06c71976823c610a4719731b68dcd6096888e Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 24 Nov 2016 14:33:07 +0200 -Subject: [PATCH] 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 ---- - 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 92b2cc7e..39f34bd5 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) - - # :: diff --git a/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb index aa9e18e763f..fafd8c5905a 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb @@ -5,7 +5,6 @@ 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 \ @@ -17,14 +16,16 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p SRCREV = "91a0bf9aada36a722855051526f012e0b5ab1af9" UPSTREAM_CHECK_GITTAGREGEX = "(?P(?!4\.90)\d+(\.\d+)+)" -DEPENDS = "glib-2.0 libsolv librepo rpm gtk-doc libmodulemd json-c swig-native util-linux" +DEPENDS = "glib-2.0 libsolv librepo rpm libmodulemd json-c swig-native util-linux" -inherit gtk-doc cmake pkgconfig setuptools3-base +inherit cmake pkgconfig setuptools3-base gettext -EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DWITH_MAN=OFF -DPYTHON_DESIRED=3 \ +EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 \ + -DWITH_GTKDOC=OFF -DWITH_MAN=OFF -DWITH_HTML=OFF \ -DWITH_TESTS=OFF \ -DWITH_ZCHUNK=OFF \ - -DWITH_HTML=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)}" From patchwork Mon Sep 22 14:20:31 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ross Burton X-Patchwork-Id: 70692 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from aws-us-west-2-korg-lkml-1.web.codeaurora.org (localhost.localdomain [127.0.0.1]) by smtp.lore.kernel.org (Postfix) with ESMTP id 489C0CAC5AA for ; Mon, 22 Sep 2025 14:21:10 +0000 (UTC) Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by mx.groups.io with SMTP id smtpd.web11.53336.1758550862679287084 for ; Mon, 22 Sep 2025 07:21:02 -0700 Authentication-Results: mx.groups.io; dkim=none (message not signed); spf=pass (domain: arm.com, ip: 217.140.110.172, mailfrom: ross.burton@arm.com) Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 180A5236D for ; Mon, 22 Sep 2025 07:20:54 -0700 (PDT) Received: from cesw-amp-gbt-1s-m12830-04.lab.cambridge.arm.com (usa-sjc-imap-foss1.foss.arm.com [10.121.207.14]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id D955F3F66E for ; Mon, 22 Sep 2025 07:21:01 -0700 (PDT) From: Ross Burton To: openembedded-core@lists.openembedded.org Subject: [PATCH 4/4] libdnf: remove obsolete path path Date: Mon, 22 Sep 2025 15:20:31 +0100 Message-ID: <20250922142031.3625684-4-ross.burton@arm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20250922142031.3625684-1-ross.burton@arm.com> References: <20250922142031.3625684-1-ross.burton@arm.com> MIME-Version: 1.0 List-Id: X-Webhook-Received: from li982-79.members.linode.com [45.33.32.79] by aws-us-west-2-korg-lkml-1.web.codeaurora.org with HTTPS for ; Mon, 22 Sep 2025 14:21:10 -0000 X-Groupsio-URL: https://lists.openembedded.org/g/openembedded-core/message/223829 We needed to remove the build path from the source tree because it was embedded into libdnf/dnf-repo.cpp. However, this was replaced with an environment variable in 0.67.0 onwards[1]. [1] libdnf 04d7fba0 ("Use environment variable in unittest instead of ugly hack in libdnf") Signed-off-by: Ross Burton --- .../libdnf/enable_test_data_dir_set.patch | 36 ------------------- meta/recipes-devtools/libdnf/libdnf_0.74.0.bb | 1 - 2 files changed, 37 deletions(-) delete mode 100644 meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch diff --git a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch b/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch deleted file mode 100644 index 6fc05d9ff8a..00000000000 --- a/meta/recipes-devtools/libdnf/libdnf/enable_test_data_dir_set.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 870f50ba4761317f2db018ac130a42087230dded Mon Sep 17 00:00:00 2001 -From: Joe Slater -Date: Wed, 22 Jul 2020 13:31:11 -0700 -Subject: [PATCH] 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 ---- - CMakeLists.txt | 7 ++++++- - 1 file changed, 6 insertions(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index b1daacb..f461e54 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -131,7 +131,12 @@ add_definitions(-DGETTEXT_DOMAIN="libdnf") - add_definitions(-DG_LOG_DOMAIN="libdnf") - - # 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) --- -2.43.0 - diff --git a/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb b/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb index fafd8c5905a..720e7d6e6f7 100644 --- a/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb +++ b/meta/recipes-devtools/libdnf/libdnf_0.74.0.bb @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;protocol=https \ 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 \ file://armarch.patch \ file://optional-check.patch \