diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-std-aux-Adjust-signature-of-_nm_assert_fail_in.patch b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-std-aux-Adjust-signature-of-_nm_assert_fail_in.patch new file mode 100644 index 0000000000..6640bce173 --- /dev/null +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager/0001-libnm-std-aux-Adjust-signature-of-_nm_assert_fail_in.patch @@ -0,0 +1,37 @@ +From 8c8b13768d22f39edfce38e123b740c43d7e31c4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sat, 18 Feb 2023 17:29:10 -0800 +Subject: [PATCH] libnm-std-aux: Adjust signature of _nm_assert_fail_internal + +the LSB states __assert_fail is: +const char*, const char*, unsigned int, const char* +https://refspecs.linuxbase.org/LSB_5.0.0/LSB-Core-generic/LSB-Core-generic/baselib---assert-fail-1.html + +musl uses a signed int instead. however, this is ok: +https://www.openwall.com/lists/musl/2019/03/04/6 + +nevertheless, since the application redefines __assert_fail, we have to make +the types match. (not upstreamable as the opposite breaks glibc) + +Upstream-Status: Inappropriate [musl specific] +Signed-off-by: Khem Raj +--- + src/libnm-std-aux/nm-std-aux.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/libnm-std-aux/nm-std-aux.h b/src/libnm-std-aux/nm-std-aux.h +index e556aa4..0756a7c 100644 +--- a/src/libnm-std-aux/nm-std-aux.h ++++ b/src/libnm-std-aux/nm-std-aux.h +@@ -230,7 +230,7 @@ typedef uint64_t _nm_bitwise nm_be64_t; + _nm_noreturn static inline void + _nm_assert_fail_internal(const char *assertion, + const char *file, +- unsigned int line, ++ int line, + const char *function) + { + __assert_fail("", file, line, ""); +-- +2.39.2 + diff --git a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.0.bb b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.0.bb index 856afd7bc8..dabf9a1d36 100644 --- a/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.0.bb +++ b/meta-networking/recipes-connectivity/networkmanager/networkmanager_1.42.0.bb @@ -30,6 +30,8 @@ SRC_URI = " \ file://enable-dhcpcd.conf \ file://enable-iwd.conf \ " +SRC_URI:append:libc-musl = " file://0001-libnm-std-aux-Adjust-signature-of-_nm_assert_fail_in.patch" + SRC_URI[sha256sum] = "2f6756d507bb6b46716594b67e6fe7491891e1b5b167bbafc5157dfa7753d5b4" S = "${WORKDIR}/NetworkManager-${PV}"