diff options
author | Khem Raj <raj.khem@gmail.com> | 2025-07-12 23:17:37 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2025-07-13 09:46:09 -0700 |
commit | 220a6e7f5d303343416e2be9bced09ae769410d8 (patch) | |
tree | b34cbe4e0b5fcbf3bbed83d2eb997bdc89eca547 | |
parent | 60c7d0de576f584b6adf2964a34ea5c5172f81a4 (diff) | |
download | meta-openembedded-220a6e7f5d303343416e2be9bced09ae769410d8.tar.gz |
ot-br-posix: Update to latest tip on trunk
Fix build with cmake4
Signed-off-by: Khem Raj <raj.khem@gmail.com>
-rw-r--r-- | meta-networking/recipes-connectivity/openthread/ot-br-posix/0001-Musl-build-fix.patch | 27 | ||||
-rw-r--r-- | meta-networking/recipes-connectivity/openthread/ot-br-posix_git.bb | 6 |
2 files changed, 2 insertions, 31 deletions
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 @@ | |||
1 | From 502aa4ab4bbc790fb2999ff2b5f10dabd7085190 Mon Sep 17 00:00:00 2001 | ||
2 | From: "deepan.shivap" <deepan.shivap@lge.com> | ||
3 | Date: Mon, 2 Dec 2024 23:12:17 +0900 | ||
4 | Subject: [PATCH] Musl build fix | ||
5 | |||
6 | usage of getaddrinfo_a creates dependency on libanl, which is specific | ||
7 | to glibc. | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | Signed-off-by: deepan.shivap <deepan.shivap@lge.com> | ||
11 | --- | ||
12 | src/posix/platform/CMakeLists.txt | 2 +- | ||
13 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
14 | |||
15 | diff --git a/src/posix/platform/CMakeLists.txt b/src/posix/platform/CMakeLists.txt | ||
16 | index b4ac241f5..7b2028e45 100644 | ||
17 | --- a/src/posix/platform/CMakeLists.txt | ||
18 | +++ b/src/posix/platform/CMakeLists.txt | ||
19 | @@ -175,7 +175,7 @@ target_link_libraries(openthread-posix | ||
20 | ) | ||
21 | |||
22 | option(OT_TARGET_OPENWRT "enable openthread posix for OpenWRT" OFF) | ||
23 | -if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT) | ||
24 | +if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux" AND NOT OT_TARGET_OPENWRT AND NOT OT_TARGET_MUSL) | ||
25 | target_compile_definitions(ot-posix-config | ||
26 | INTERFACE "OPENTHREAD_POSIX_CONFIG_NAT64_AIL_PREFIX_ENABLE=1" | ||
27 | ) | ||
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" | |||
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=87109e44b2fda96a8991f27684a7349c \ | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=87109e44b2fda96a8991f27684a7349c \ |
8 | file://third_party/cJSON/repo/LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0 \ | 8 | file://third_party/cJSON/repo/LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0 \ |
9 | file://third_party/cpp-httplib/repo/LICENSE;md5=1321bdf796c67e3a8ab8e352dd81474b \ | 9 | file://third_party/cpp-httplib/repo/LICENSE;md5=1321bdf796c67e3a8ab8e352dd81474b \ |
10 | file://third_party/http-parser/repo/LICENSE-MIT;md5=9bfa835d048c194ab30487af8d7b3778 \ | ||
11 | file://third_party/openthread/repo/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ | 10 | file://third_party/openthread/repo/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ |
12 | " | 11 | " |
13 | DEPENDS = "autoconf-archive dbus readline avahi jsoncpp boost libnetfilter-queue protobuf protobuf-native" | 12 | DEPENDS = "autoconf-archive dbus readline avahi jsoncpp boost libnetfilter-queue protobuf protobuf-native" |
14 | SRCREV = "fe5855332e8f804944d737c65b75cf9a89c35e77" | 13 | SRCREV = "7142b740479e50f6f2c2a91a369b9c36e024fe0d" |
15 | PV = "0.3.0+git" | 14 | PV = "0.3.0+git" |
16 | 15 | ||
17 | SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=main \ | 16 | SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=main \ |
18 | file://0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch \ | 17 | file://0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch \ |
19 | file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \ | 18 | file://0001-cmake-Disable-nonnull-compare-warning-on-gcc.patch \ |
20 | file://default-cxx-std.patch \ | 19 | file://default-cxx-std.patch \ |
21 | file://0001-Musl-build-fix.patch;patchdir=third_party/openthread/repo \ | ||
22 | " | 20 | " |
23 | 21 | ||
24 | SYSTEMD_SERVICE:${PN} = "otbr-agent.service" | 22 | SYSTEMD_SERVICE:${PN} = "otbr-agent.service" |
@@ -57,8 +55,8 @@ EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \ | |||
57 | -DOT_REFERENCE_DEVICE=ON \ | 55 | -DOT_REFERENCE_DEVICE=ON \ |
58 | -DOT_DHCP6_CLIENT=ON \ | 56 | -DOT_DHCP6_CLIENT=ON \ |
59 | -DOT_DHCP6_SERVER=ON \ | 57 | -DOT_DHCP6_SERVER=ON \ |
58 | -DCMAKE_POLICY_VERSION_MINIMUM=3.5 \ | ||
60 | " | 59 | " |
61 | EXTRA_OECMAKE:append:libc-musl = " -DOT_TARGET_MUSL=ON" | ||
62 | 60 | ||
63 | RDEPENDS:${PN} = "iproute2 ipset avahi-daemon" | 61 | RDEPENDS:${PN} = "iproute2 ipset avahi-daemon" |
64 | 62 | ||