libdnf: upgrade 0.74.0 -> 0.75.0
PATCH v2 1/1 libdnf: upgrade 0.74.0 -> 0.75.0
From: Wang Mingyu <[email protected]>
optional-check.patch
removed since it's included in 0.75.0
Add patches to fix compilation error with musl:
0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch 0001-utils-utils.cpp-fix-compilation-with-musl.patch
---
...FNM_EXTMATCH-if-not-already-like-und.patch | 39 ++++++++++++++
...-utils.cpp-fix-compilation-with-musl.patch | 51 ++++++++++++++++++
.../libdnf/libdnf/optional-check.patch | 52 -------------------
.../{libdnf_0.74.0.bb => libdnf_0.75.0.bb} | 7 ++-
4 files changed, 95 insertions(+), 54 deletions(-)
create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch
create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-utils-utils.cpp-fix-compilation-with-musl.patch
delete mode 100644 meta/recipes-devtools/libdnf/libdnf/optional-check.patch
rename meta/recipes-devtools/libdnf/{libdnf_0.74.0.bb => libdnf_0.75.0.bb} (85%)meta/recipes-devtools/libdnf/libdnf/0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch new file +39 -0
@@ -0,0 +1,39 @@ +From 486d1c7826efb9e42bbb18b6537fd23a0a33b324 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <[email protected]> +Date: Sun, 16 Nov 2025 23:29:18 +0000 +Subject: [PATCH] dnf-repo: Define FNM_EXTMATCH if not already (like under + musl). + +With musl, FNM_EXTMATCH is not defined: +dnf-repo.cpp +| dnf-repo.cpp: In function 'void dnf_repo_conf_load_overrides(DnfRepo*, const char*)': +| dnf-repo.cpp:971:50: error: 'FNM_EXTMATCH' was not declared in this scope; did you mean 'FNM_NOMATCH'? +| 971 | if (fnmatch(repo_id_pattern, repoId, FNM_EXTMATCH) != 0) { +| | ^~~~~~~~~~~~ +| | FNM_NOMATCH + +Upstream-Status: Submitted[https://github.com/rpm-software-management/libdnf/pull/1737/commits/47ed831c1fdb32519f2d66fee91bc47f9521d1d4] + +Signed-off-by: Wang Mingyu <[email protected]> +--- + libdnf/dnf-repo.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/libdnf/dnf-repo.cpp b/libdnf/dnf-repo.cpp +index 44c0f8758..d53959414 100644 +--- a/libdnf/dnf-repo.cpp ++++ b/libdnf/dnf-repo.cpp +@@ -69,6 +69,10 @@ + #include <string> + #include <vector> + ++#if !defined(FNM_EXTMATCH) ++#define FNM_EXTMATCH 0 ++#endif ++ + typedef struct + { + DnfRepoEnabled enabled; +-- +2.43.0 +
meta/recipes-devtools/libdnf/libdnf/0001-utils-utils.cpp-fix-compilation-with-musl.patch new file +51 -0
51 lines not on this page · raw message
meta/recipes-devtools/libdnf/libdnf/optional-check.patch deleted +0 -52
52 lines not on this page · raw message
meta/recipes-devtools/libdnf/libdnf_0.75.0.bb renamed from meta/recipes-devtools/libdnf/libdnf_0.74.0.bb +5 -2
@@ -9,16 +9,19 @@ SRC_URI = "git://github.com/rpm-software-management/libdnf;branch=dnf-4-master;p file://0001-Get-parameters-for-both-libsolv-and-libsolvext-libdn.patch \ file://0001-drop-FindPythonInstDir.cmake.patch \ file://armarch.patch \ - file://optional-check.patch \ + file://0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch \ + file://0001-utils-utils.cpp-fix-compilation-with-musl.patch \ " -SRCREV = "91a0bf9aada36a722855051526f012e0b5ab1af9" +SRCREV = "d39573195e24b43687587a8d83b9f6ac274e2412" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!4\.90)\d+(\.\d+)+)" DEPENDS = "glib-2.0 libsolv librepo rpm libmodulemd json-c swig-native util-linux" inherit cmake pkgconfig setuptools3-base gettext +COMPATIBLE_HOST_libc-musl = 'null' + EXTRA_OECMAKE = " -DPYTHON_INSTALL_DIR=${PYTHON_SITEPACKAGES_DIR} -DPYTHON_DESIRED=3 \ -DWITH_GTKDOC=OFF -DWITH_MAN=OFF -DWITH_HTML=OFF \ -DWITH_TESTS=OFF \
Signature · 1 line
2.43.0
Quoted 33 lines · wangmy via lists.openembedded.org
From: Wang Mingyu <[email protected]>
optional-check.patch
removed since it's included in 0.75.0Add patches to fix compilation error with musl:
0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch 0001-utils-utils.cpp-fix-compilation-with-musl.patchSigned-off-by Wang Mingyu <[email protected]>--- ...FNM_EXTMATCH-if-not-already-like-und.patch | 39 ++++++++++++++ ...-utils.cpp-fix-compilation-with-musl.patch | 51 ++++++++++++++++++ .../libdnf/libdnf/optional-check.patch | 52 ------------------- .../{libdnf_0.74.0.bb => libdnf_0.75.0.bb} | 7 ++- 4 files changed, 95 insertions(+), 54 deletions(-) create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch create mode 100644 meta/recipes-devtools/libdnf/libdnf/0001-utils-utils.cpp-fix-compilation-with-musl.patch delete mode 100644 meta/recipes-devtools/libdnf/libdnf/optional-check.patch rename meta/recipes-devtools/libdnf/{libdnf_0.74.0.bb => libdnf_0.75.0.bb} (85%)meta/recipes-devtools/libdnf/libdnf/0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch new file +6
-0@@ -0,0 +1,39 @@ +From 486d1c7826efb9e42bbb18b6537fd23a0a33b324 Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <[email protected]> +Date: Sun, 16 Nov 2025 23:29:18 +0000 +Subject: [PATCH] dnf-repo: Define FNM_EXTMATCH if not already (like under + musl). +
meta/recipes-devtools/libdnf/libdnf/0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch line 16
Quoted 10 lines
meta/recipes-devtools/libdnf/libdnf/0001-dnf-repo-Define-FNM_EXTMATCH-if-not-already-like-und.patch new file +10
-0+With musl, FNM_EXTMATCH is not defined: +dnf-repo.cpp +| dnf-repo.cpp: In function 'void dnf_repo_conf_load_overrides(DnfRepo*, const char*)': +| dnf-repo.cpp:971:50: error: 'FNM_EXTMATCH' was not declared in this scope; did you mean 'FNM_NOMATCH'? +| 971 | if (fnmatch(repo_id_pattern, repoId, FNM_EXTMATCH) != 0) { +| | ^~~~~~~~~~~~ +| | FNM_NOMATCH + +Upstream-Status: Submitted[https://github.com/rpm-software-management/libdnf/pull/1737/commits/47ed831c1fdb32519f2d66fee91bc47f9521d1d4] +
Hi Wang,
There is a missing space, it should be:
Upstream-Status: Submitted [https://...]
Thanks,
Mathieu
Signature · 3 lines
Mathieu Dubois-Briand, Bootlin Embedded Linux and Kernel engineering https://bootlin.com