From 071e1b57b61d45eff283f50f114faa6bef00171d Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Mon, 22 Sep 2025 15:20:31 +0100 Subject: [PATCH] libdnf: remove obsolete path patch 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") (From OE-Core rev: 948e92562e3a565f97c5eed2992c1d7ecfcc6305) Signed-off-by: Ross Burton Signed-off-by: Mathieu Dubois-Briand Signed-off-by: Richard Purdie --- .../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 6fc05d9ff8..0000000000 --- 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 fafd8c5905..720e7d6e6f 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 \