diff --git a/meta-ohos-staging/recipes-connectivity/openthread/wpantund/0001-util-netif-mgmt-only-include-missing-strlcpy-header-.patch b/meta-ohos-staging/recipes-connectivity/openthread/wpantund/0001-util-netif-mgmt-only-include-missing-strlcpy-header-.patch deleted file mode 100644 index 4c8f6791e801969ab6ea1ee8b5868c00efaf7f7a..0000000000000000000000000000000000000000 --- a/meta-ohos-staging/recipes-connectivity/openthread/wpantund/0001-util-netif-mgmt-only-include-missing-strlcpy-header-.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 797c56efbb8aa8653549a4e4a38d4c9f2ceace28 Mon Sep 17 00:00:00 2001 -From: Stefan Schmidt <stefan.schmidt@huawei.com> -Date: Fri, 21 May 2021 22:44:31 +0200 -Subject: [PATCH] util/netif-mgmt: only include missing strlcpy header if - actually missing - -In commit 4e2ef143046a0c89afe6fd66acf5b7a7f35e8356 this header was -added unconditionally. For my system (Yocto with musl) this results in -strlcpy being redefined to __missing_strlcpy in all cases. No matter if -strlcpy is available or not. - -Given it is available and the nl.m4 macros detects this, the libstrlcpy.la -helper is not built which results in: - -netif-mgmt.c:386: more undefined references to `___missing_strlcpy' follow - -Upstream-Status: Submitted [https://github.com/openthread/wpantund/pull/497] - -Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com> ---- - src/util/netif-mgmt.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/util/netif-mgmt.c b/src/util/netif-mgmt.c -index 3fffb2e..8fa0107 100644 ---- a/src/util/netif-mgmt.c -+++ b/src/util/netif-mgmt.c -@@ -69,7 +69,9 @@ - #define IFEF_NOAUTOIPV6LL 0x2000 /* Interface IPv6 LinkLocal address not provided by kernel */ - #endif - -+#ifdef MISSING_STRLCPY - #include "missing/strlcpy/strlcpy.h" -+#endif - - #ifndef SIOCSIFLLADDR - #define SIOCSIFLLADDR SIOCSIFHWADDR diff --git a/meta-ohos-staging/recipes-connectivity/openthread/wpantund_git.bb b/meta-ohos-staging/recipes-connectivity/openthread/wpantund_git.bb index 47a79650b283a68b01fc921e98b0c54cbadc8a04..df70754bd8a137ecb5d5d2f73e0d39fc28077373 100644 --- a/meta-ohos-staging/recipes-connectivity/openthread/wpantund_git.bb +++ b/meta-ohos-staging/recipes-connectivity/openthread/wpantund_git.bb @@ -14,11 +14,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=e7820bc7f7d1638a6b54fc2e8d7fb103 \ " SRC_URI = "gitsm://github.com/openthread/wpantund.git;protocol=https \ - file://0001-util-netif-mgmt-only-include-missing-strlcpy-header-.patch \ " PV = "0.07.01+git${SRCPV}" -SRCREV = "820468161c87816a3e94366ebbe2a932650416e3" +SRCREV = "bf45115f41ba2b8029eda174be2b93dea73b9261" S = "${WORKDIR}/git"