From 96e1d7e81b9cff8664347c1a306c0fba10591c6c Mon Sep 17 00:00:00 2001
From: Stefan Schmidt <stefan.schmidt@huawei.com>
Date: Thu, 28 Jan 2021 20:43:14 +0100
Subject: [PATCH] ot-br-posix: Add OpenThread border router recipe
Two additional patches to make it build with musl.
Closes: https://git.ostc-eu.org/OSTC/planning/core-os/-/issues/2
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
...p-Werror-to-avoid-compilation-breaks.patch | 32 +++++++++++++++
...lient-add-needed-header-for-fd_set-c.patch | 27 +++++++++++++
.../openthread/ot-br-posix_git.bb | 40 +++++++++++++++++++
3 files changed, 99 insertions(+)
create mode 100644 meta-ohos-staging/recipes-connectivity/openthread/ot-br-posix/0001-build-drop-Werror-to-avoid-compilation-breaks.patch
create mode 100644 meta-ohos-staging/recipes-connectivity/openthread/ot-br-posix/0001-web-service-ot-client-add-needed-header-for-fd_set-c.patch
create mode 100644 meta-ohos-staging/recipes-connectivity/openthread/ot-br-posix_git.bb
diff --git a/meta-ohos-staging/recipes-connectivity/openthread/ot-br-posix/0001-build-drop-Werror-to-avoid-compilation-breaks.patch b/meta-ohos-staging/recipes-connectivity/openthread/ot-br-posix/0001-build-drop-Werror-to-avoid-compilation-breaks.patch
new file mode 100644
index 00000000..32ba4171
--- /dev/null
+++ b/meta-ohos-staging/recipes-connectivity/openthread/ot-br-posix/0001-build-drop-Werror-to-avoid-compilation-breaks.patch
@@ -0,0 +1,32 @@
+From 592605f1f1d3b8bf1cbe9371b1e80b7521794dc1 Mon Sep 17 00:00:00 2001
+From: Stefan Schmidt <stefan.schmidt@huawei.com>
+Date: Sat, 6 Feb 2021 12:37:57 +0100
+Subject: [PATCH] build: drop -Werror to avoid compilation breaks.
+
+We had a warning turning into an error and breaking the compilation:
+ error: #warning _FORTIFY_SOURCE requires compiling with optimization (-O) [-Werror=cpp]
+ 397 | # warning _FORTIFY_SOURCE requires compiling with optimization (-O)
+
+This patch works around this for now. A better way to avoid the warning
+in the first place is needed.
+
+Upstream-Status: Inappropriate [other]
+
+Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
+---
+ CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8bbde8c0..2fe251ce 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -59,7 +59,7 @@ if (OTBR_COVERAGE AND CMAKE_CXX_COMPILER_ID MATCHES "GNU|Clang")
+ target_link_libraries(otbr-config INTERFACE --coverage)
+ endif()
+
+-add_compile_options(-Wall -Wextra -Werror -Wfatal-errors -Wno-missing-braces)
++add_compile_options(-Wall -Wextra -Wfatal-errors -Wno-missing-braces)
+
+
+ execute_process(
diff --git a/meta-ohos-staging/recipes-connectivity/openthread/ot-br-posix/0001-web-service-ot-client-add-needed-header-for-fd_set-c.patch b/meta-ohos-staging/recipes-connectivity/openthread/ot-br-posix/0001-web-service-ot-client-add-needed-header-for-fd_set-c.patch
new file mode 100644
index 00000000..46679215
--- /dev/null
+++ b/meta-ohos-staging/recipes-connectivity/openthread/ot-br-posix/0001-web-service-ot-client-add-needed-header-for-fd_set-c.patch
@@ -0,0 +1,27 @@
+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: Pending
+
+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-ohos-staging/recipes-connectivity/openthread/ot-br-posix_git.bb b/meta-ohos-staging/recipes-connectivity/openthread/ot-br-posix_git.bb
new file mode 100644
index 00000000..6d119259
--- /dev/null
+++ b/meta-ohos-staging/recipes-connectivity/openthread/ot-br-posix_git.bb
@@ -0,0 +1,40 @@
+# SPDX-FileCopyrightText: Huawei Inc.
+#
+# SPDX-License-Identifier: Apache-2.0
+
+SUMMARY = "OpenThread Border Router"
+SECTION = "net"
+LICENSE = "BSD-3-Clause & MIT & Apache-2.0"
+LIC_FILES_CHKSUM = "file://LICENSE;md5=87109e44b2fda96a8991f27684a7349c \
+ file://third_party/Simple-web-server/repo/LICENSE;md5=852b3f7f320b19f6431487b8b2fb1d74 \
+ file://third_party/angular-material/repo/LICENSE;md5=3d0c299b7dd4267c3ef21a705cf6a5c6 \
+ file://third_party/angular/repo/LICENSE.md;md5=0d83982330e37f011a2cef9b15cb43aa \
+ file://third_party/cJSON/repo/LICENSE;md5=218947f77e8cb8e2fa02918dc41c50d0 \
+ file://third_party/d3js/repo/LICENSE;md5=e863f3b38093ec361d12ed4ff001c403 \
+ file://third_party/http-parser/repo/LICENSE-MIT;md5=9bfa835d048c194ab30487af8d7b3778 \
+ file://third_party/mdl/repo/LICENSE;md5=6f740e801ce5a08c6c113bf72859bff2 \
+ file://third_party/openthread/repo/LICENSE;md5=543b6fe90ec5901a683320a36390c65f \
+ "
+
+SRC_URI = "gitsm://github.com/openthread/ot-br-posix.git;protocol=https \
+ file://0001-build-drop-Werror-to-avoid-compilation-breaks.patch \
+ file://0001-web-service-ot-client-add-needed-header-for-fd_set-c.patch \
+ "
+
+PV = "0.2+git${SRCPV}"
+SRCREV = "5de1086daa12fda3d6d2b8b7d0f8954b709d5f66"
+
+S = "${WORKDIR}/git"
+
+DEPENDS = "autoconf-archive dbus readline avahi jsoncpp boost"
+
+inherit cmake systemd
+
+SYSTEMD_SERVICE_${PN} = "otbr-agent.service otbr-web.service"
+
+EXTRA_OECMAKE = "-DBUILD_TESTING=OFF -DOTBR_DBUS=ON -DOTBR_REST=ON -DOTBR_WEB=ON -DCMAKE_LIBRARY_PATH=${libdir}"
+
+FILES_${PN} += "${systemd_unitdir}/*"
+FILES_${PN} += "${datadir}/*"
+
+RCONFLICTS_${PN} = "ot-daemon"
--
GitLab