diff --git a/meta-oniro-staging/recipes-connectivity/openthread/ot-br-posix/0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch b/meta-oniro-staging/recipes-connectivity/openthread/ot-br-posix/0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch deleted file mode 100644 index 250de4bdd8193268793b9925e349c52f65edaf89..0000000000000000000000000000000000000000 --- a/meta-oniro-staging/recipes-connectivity/openthread/ot-br-posix/0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch +++ /dev/null @@ -1,35 +0,0 @@ -From ed60d4605b81c43b9ba9504a37835109c247c6f8 Mon Sep 17 00:00:00 2001 -From: Stefan Schmidt <stefan.schmidt@huawei.com> -Date: Fri, 1 Apr 2022 21:46:03 +0200 -Subject: [PATCH] otbr-agent.service.in: remove pre exec hook for mdns service - -It uses the service command which is not available in all cases under -Yocto/OE. The upstream project uses this mainly with Ubuntu and Raspian -as testbeds. - -In our case we simply ensure that avahi-daemon is installed on the -system inside the recipe. - -Upstream-Status: Inappropriate [OE specific] - -Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com> ---- - src/agent/otbr-agent.service.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/agent/otbr-agent.service.in b/src/agent/otbr-agent.service.in -index 8314121347..4c97869def 100644 ---- a/src/agent/otbr-agent.service.in -+++ b/src/agent/otbr-agent.service.in -@@ -6,7 +6,7 @@ After=dbus.socket - - [Service] - EnvironmentFile=-@CMAKE_INSTALL_FULL_SYSCONFDIR@/default/otbr-agent --@EXEC_START_PRE@ExecStart=@CMAKE_INSTALL_FULL_SBINDIR@/otbr-agent $OTBR_AGENT_OPTS -+ExecStart=@CMAKE_INSTALL_FULL_SBINDIR@/otbr-agent $OTBR_AGENT_OPTS - KillMode=mixed - Restart=on-failure - RestartSec=5 --- -2.35.1 - diff --git a/meta-oniro-staging/recipes-connectivity/openthread/ot-br-posix/0001-web-service-ot-client-add-needed-header-for-fd_set-c.patch b/meta-oniro-staging/recipes-connectivity/openthread/ot-br-posix/0001-web-service-ot-client-add-needed-header-for-fd_set-c.patch deleted file mode 100644 index 29f2af8492b1d6ab6e347c385b99d899c1e5afde..0000000000000000000000000000000000000000 --- a/meta-oniro-staging/recipes-connectivity/openthread/ot-br-posix/0001-web-service-ot-client-add-needed-header-for-fd_set-c.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 596eb2b582609794d87f2dbefa4b2e839faf52c8 Mon Sep 17 00:00:00 2001 -From: Stefan Schmidt <stefan.schmidt@huawei.com> -Date: Fri, 28 May 2021 14:19:53 +0200 -Subject: [PATCH] web-service/ot-client: add needed header for fd_set() call - -The select.h header file is needed for fd_set(). Depending on the -compiler and settings this will result in an error when not included. - -Upstream-Status: Submitted [https://github.com/openthread/ot-br-posix/pull/1326] - -Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com> ---- - src/web/web-service/ot_client.cpp | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/web/web-service/ot_client.cpp b/src/web/web-service/ot_client.cpp -index f151a0126..173cc48e1 100644 ---- a/src/web/web-service/ot_client.cpp -+++ b/src/web/web-service/ot_client.cpp -@@ -39,6 +39,7 @@ - #include <string.h> - #include <sys/socket.h> - #include <sys/un.h> -+#include <sys/select.h> - #include <unistd.h> - - #include "common/code_utils.hpp" diff --git a/meta-oniro-staging/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-oniro-staging/recipes-connectivity/openthread/ot-br-posix_git.bb deleted file mode 100644 index 5247ad4dba335017b35acd6c8620e7bcf59d1276..0000000000000000000000000000000000000000 --- a/meta-oniro-staging/recipes-connectivity/openthread/ot-br-posix_git.bb +++ /dev/null @@ -1,59 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 -SUMMARY = "OpenThread Border Router" -SECTION = "net" -LICENSE = "BSD-3-Clause & MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=87109e44b2fda96a8991f27684a7349c \ - file://third_party/Simple-web-server/repo/LICENSE;md5=852b3f7f320b19f6431487b8b2fb1d74 \ - file://third_party/cJSON/repo/LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0 \ - 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" -SRCREV = "9ef4e310b05ca0dbecb549e92ce7caa9d7461f19" -PV = "0.3.0+git${SRCPV}" - -SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https;branch=main \ - file://0001-web-service-ot-client-add-needed-header-for-fd_set-c.patch \ - file://0001-otbr-agent.service.in-remove-pre-exec-hook-for-mdns-.patch \ - " - -S = "${WORKDIR}/git" -SYSTEMD_SERVICE:${PN} = "otbr-agent.service" - -inherit pkgconfig cmake systemd - -EXTRA_OECMAKE = "-DBUILD_TESTING=OFF \ - -DOTBR_DBUS=ON \ - -DOTBR_REST=ON \ - -DOTBR_WEB=OFF \ - -DCMAKE_LIBRARY_PATH=${libdir} \ - -DOTBR_MDNS=avahi \ - -DOTBR_BACKBONE_ROUTER=ON \ - -DOTBR_BORDER_ROUTING=ON \ - -DOTBR_SRP_ADVERTISING_PROXY=ON \ - -DOTBR_BORDER_AGENT=ON \ - -DOT_SPINEL_RESET_CONNECTION=ON \ - -DOT_TREL=ON \ - -DOT_MLR=ON \ - -DOT_SRP_SERVER=ON \ - -DOT_ECDSA=ON \ - -DOT_SERVICE=ON \ - -DOTBR_DUA_ROUTING=ON \ - -DOT_DUA=ON \ - -DOT_BORDER_ROUTING_NAT64=ON \ - -DOTBR_DNSSD_DISCOVERY_PROXY=ON \ - -DOTBR_INFRA_IF_NAME=eth0 \ - -DOTBR_NO_AUTO_ATTACH=1 \ - -DOT_REFERENCE_DEVICE=ON \ - -DOT_DHCP6_CLIENT=ON \ - -DOT_DHCP6_SERVER=ON \ - " - -RDEPENDS:${PN} = "iproute2 avahi-daemon" - -RCONFLICTS:${PN} = "ot-daemon" - -FILES:${PN} += "${systemd_unitdir}/*" -FILES:${PN} += "${datadir}/*" diff --git a/meta-oniro-staging/recipes-connectivity/openthread/ot-daemon_git.bb b/meta-oniro-staging/recipes-connectivity/openthread/ot-daemon_git.bb deleted file mode 100644 index f3f4c70fa278ed534d8304987cc856ce638b5efe..0000000000000000000000000000000000000000 --- a/meta-oniro-staging/recipes-connectivity/openthread/ot-daemon_git.bb +++ /dev/null @@ -1,27 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 -SUMMARY = "OpenThread Daemon is an OpenThread POSIX build mode that runs OpenThread as a service." -SECTION = "net" -LICENSE = "BSD-3-Clause & Apache-2.0" -LIC_FILES_CHKSUM = "file://LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ - file://third_party/mbedtls/repo/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \ - " -DEPENDS = "readline" -SRCREV = "7dfde1f12923f03c9680be4d838b94b7a2320324" -PV = "0.1+git${SRCPV}" - -SRC_URI = "git://github.com/openthread/openthread.git;protocol=https;branch=main \ - " - -S = "${WORKDIR}/git" - -inherit cmake - -EXTRA_OECMAKE = "-DOT_DAEMON=ON \ - -DOT_SPINEL_RESET_CONNECTION=ON \ - -DOT_THREAD_VERSION=1.2 \ - -DOT_COVERAGE=OFF \ - -DOT_PLATFORM=posix \ - -DCMAKE_BUILD_TYPE=Release \ - " diff --git a/meta-oniro-staging/recipes-connectivity/openthread/wpantund_git.bb b/meta-oniro-staging/recipes-connectivity/openthread/wpantund_git.bb deleted file mode 100644 index bb444d04f527f44c1bc5b85553d6bffdce4c0d26..0000000000000000000000000000000000000000 --- a/meta-oniro-staging/recipes-connectivity/openthread/wpantund_git.bb +++ /dev/null @@ -1,32 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: Apache-2.0 -SUMMARY = "wpantund, Userspace WPAN Network Daemon" -SECTION = "net" -LICENSE = "Apache-2.0 & MIT & BSL-1.0 & BSD-3-Clause" -LIC_FILES_CHKSUM = "file://LICENSE;md5=e7820bc7f7d1638a6b54fc2e8d7fb103 \ - file://third_party/assert-macros/LICENSE;md5=cbf35ecdc8161026afe4da2906fab204 \ - file://third_party/boost/LICENSE;md5=e4224ccaecb14d942c71d31bef20d78c \ - file://third_party/fgetln/LICENSE;md5=389e03d2254ecad45d0d9bbdefef7129 \ - file://third_party/openthread/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \ - file://third_party/pt/LICENSE;md5=dcd598b69cad786beea33da7b1ae14b7 \ - " -DEPENDS = "autoconf-archive dbus readline" -SRCREV = "0fb1f57e4224e2df3e630e146702bfcf63fbf07a" -PV = "0.07.01+git${SRCPV}" - -SRC_URI = "gitsm://github.com/openthread/wpantund.git;protocol=https;branch=master \ - " - -S = "${WORKDIR}/git" - -inherit pkgconfig perlnative autotools - -# CVE-2020-8916 has been fixed in commit -# 3f108441e23e033b936e85be5b6877dd0a1fbf1c which is included in the SRCREV -# CVE-2021-33889 has been fixed in commit -# a8f3f761f6753b567d1e5ad22cbe6b0ceb6f2649 which is included in the SRCREV -# There has not been a wpantund release as of yet that includes these fixes. -# That means cve-check can not match them. Once a new release comes we can -# remove the ignore statement. -CVE_CHECK_IGNORE = "CVE-2020-8916 CVE-2021-33889"