diff mbox series

[meta-networking,6/7] ot-br-posix: Update to latest tip on trunk

Message ID 20250713063023.3538218-6-raj.khem@gmail.com
State New
Headers show
Series [meta-oe,1/7] wxwidgets: Enable webui and mediactrl packageconfigs by default | expand

Commit Message

Khem Raj July 13, 2025, 6:30 a.m. UTC 
Fix build with cmake4

Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
 .../ot-br-posix/0001-Musl-build-fix.patch     | 27 -------------------
 .../openthread/ot-br-posix_git.bb             |  6 ++---
 2 files changed, 2 insertions(+), 31 deletions(-)
 delete mode 100644 meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch
diff mbox series

Patch

diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch b/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch
deleted file mode 100644
index 108ed76b30..0000000000
--- a/meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@ 
-From 502aa4ab4bbc790fb2999ff2b5f10dabd7085190 Mon Sep 17 00:00:00 2001
-From: "deepan.shivap" <deepan.shivap@lge.com>
-Date: Mon, 2 Dec 2024 23:12:17 +0900
-Subject: [PATCH] Musl build fix
-
-usage of getaddrinfo_a creates dependency on libanl, which is  specific
-to glibc.
-
-Upstream-Status: Pending
-Signed-off-by: deepan.shivap <deepan.shivap@lge.com>
----
- src/posix/platform/CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/posix/platform/CMakeLists.txt b/src/posix/platform/CMakeLists.txt
-index b4ac241f5..7b2028e45 100644
---- a/src/posix/platform/CMakeLists.txt
-+++ b/src/posix/platform/CMakeLists.txt
-@@ -175,7 +175,7 @@ target_link_libraries(openthread-posix
- )
- 
- option(OT_TARGET_OPENWRT "enable openthread posix for OpenWRT" OFF)
--if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT)
-+if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT AND NOT OT_TARGET_MUSL)
-     target_compile_definitions(ot-posix-config
-         INTERFACE "OPENTHREAD_POSIX_CONFIG_NAT64_AIL_PREFIX_ENABLE=1"
-     )
diff --git a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb
index 576c316ec3..d0b4f81a4c 100644
--- a/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb
+++ b/meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb
@@ -7,18 +7,16 @@  LICENSE = "BSD-3-Clause & MIT"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=87109e44b2fda96a8991f27684a7349c \
                     file://third_party/cJSON/repo/LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0 \
                     file://third_party/cpp-httplib/repo/LICENSE;md5=1321bdf796c67e3a8ab8e352dd81474b \
-                    file://third_party/http-parser/repo/LICENSE-MIT;md5=9bfa835d048c194ab30487af8d7b3778 \
                     file://third_party/openthread/repo/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \
                     "
 DEPENDS = "autoconf-archive dbus readline avahi jsoncpp boost libnetfilter-queue protobuf protobuf-native"
-SRCREV = "fe5855332e8f804944d737c65b75cf9a89c35e77"
+SRCREV = "7142b740479e50f6f2c2a91a369b9c36e024fe0d"
 PV = "0.3.0+git"
 
 SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=main \
            file://0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch \
            file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \
            file://default-cxx-std.patch \
-           file://0001-Musl-build-fix.patch;patchdir=third_party/openthread/repo \
            "
 
 SYSTEMD_SERVICE:${PN} = "otbr-agent.service"
@@ -57,8 +55,8 @@  EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \
                  -DOT_REFERENCE_DEVICE=ON \
                  -DOT_DHCP6_CLIENT=ON \
                  -DOT_DHCP6_SERVER=ON \
+                 -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \
                  "
-EXTRA_OECMAKE:append:libc-musl = " -DOT_TARGET_MUSL=ON"
 
 RDEPENDS:${PN} = "iproute2 ipset avahi-daemon"