diff mbox series

[4/4] libdnf: remove obsolete path path

Message ID 20250922142031.3625684-4-ross.burton@arm.com
State New
Headers show
Series [1/4] libdnf: don't depend on libcheck | expand

Commit Message

Ross Burton Sept. 22, 2025, 2:20 p.m. UTC
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 <ross.burton@arm.com>
---
 .../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

Comments

Peter Kjellerstedt Sept. 23, 2025, 3:14 p.m. UTC | #1
> -----Original Message-----
> From: openembedded-core@lists.openembedded.org <openembedded-core@lists.openembedded.org> On Behalf Of Ross Burton via lists.openembedded.org
> Sent: den 22 september 2025 16:21
> To: openembedded-core@lists.openembedded.org
> Subject: [OE-core] [PATCH 4/4] libdnf: remove obsolete path path

path path -> path patch

//Peter

> 
> 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 <ross.burton@arm.com>
> ---
>  .../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 <joe.slater@windriver.com>
> -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 <joe.slater@windriver.com>
> ----
> - 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 \
> --
> 2.43.0
diff mbox series

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 <joe.slater@windriver.com>
-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 <joe.slater@windriver.com>
----
- 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 \