From 09291225aeae0592f889c92188b012bc83c263e5 Mon Sep 17 00:00:00 2001
From: Robert Drab <robert.drab@huawei.com>
Date: Thu, 1 Jul 2021 15:14:13 +0200
Subject: [PATCH] matter: add initial recipe
Recipe for the Matter networking protocol (formerly known as CHIP). This
project has more the form of a vendor SDK with support for many bare
metal SDK's as well as various operating systems.
This recipe does focus on the Linux build and configures the project to
disable all extra third_party git submodules (we only use 6 out of 48).
Matter uses the GN meta build system, therefore using gn.bbclass as a base
for the recipe. gn.bbclass requires patching BUILDCONFIG.gn file to set default
toolchain and add compiler/linker flags to the yocto-provided ones.
Mbedtls version integrated in Matter doesn't compile cleanly with GCC
v11. It is not required by currently used Linux target but in case it's needed
version provided by the Yocto build system shall be used instead of this
integrated one and therefore disabling building of the mbedtls completely.
Signed-off-by: Robert Drab <robert.drab@huawei.com>
Signed-off-by: Stefan Schmidt <stefan.schmidt@huawei.com>
---
...matter-use-Yocto-toolchain-and-flags.patch | 59 ++++++++++++++
...building-integrated-library-in-Yocto.patch | 48 ++++++++++++
.../recipes-connectivity/matter/matter_git.bb | 76 +++++++++++++++++++
3 files changed, 183 insertions(+)
create mode 100644 meta-oniro-staging/recipes-connectivity/matter/matter/0001-projectmatter-use-Yocto-toolchain-and-flags.patch
create mode 100644 meta-oniro-staging/recipes-connectivity/matter/matter/0002-mbedtls-disable-building-integrated-library-in-Yocto.patch
create mode 100644 meta-oniro-staging/recipes-connectivity/matter/matter_git.bb
diff --git a/meta-oniro-staging/recipes-connectivity/matter/matter/0001-projectmatter-use-Yocto-toolchain-and-flags.patch b/meta-oniro-staging/recipes-connectivity/matter/matter/0001-projectmatter-use-Yocto-toolchain-and-flags.patch
new file mode 100644
index 00000000..1a16778e
--- /dev/null
+++ b/meta-oniro-staging/recipes-connectivity/matter/matter/0001-projectmatter-use-Yocto-toolchain-and-flags.patch
@@ -0,0 +1,59 @@
+From e3b4a102df178281bf755fc7ea7dfa72656a9fea Mon Sep 17 00:00:00 2001
+From: Robert Drab <robert.drab@huawei.com>
+Date: Wed, 4 Aug 2021 13:47:48 +0200
+Subject: [PATCH] projectmatter: use Yocto toolchain and flags
+
+gn.bbclass that enables building GN meta build system based projects in Yocto
+requires patching BUILDCONFIG.gn file:
+- Yocto toolchain has to be set as default toolchain
+- Yocto flags have to be included in the targets' default configs
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Robert Drab <robert.drab@huawei.com>
+---
+ build/config/BUILDCONFIG.gn | 22 ++++++++++++++++------
+ 1 file changed, 16 insertions(+), 6 deletions(-)
+
+diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
+index 80da6a986..cc23b7ce6 100644
+--- a/build/config/BUILDCONFIG.gn
++++ b/build/config/BUILDCONFIG.gn
+@@ -92,21 +92,31 @@ if (_chip_defaults.custom_toolchain != "") {
+ assert(false, "No toolchain specified, please specify custom_toolchain")
+ }
+
+-set_default_toolchain(_default_toolchain)
++set_default_toolchain("//build/toolchain/yocto/target:yocto_target")
+
+ set_defaults("static_library") {
+- configs = _chip_defaults.default_configs
++ configs =
++ _chip_defaults.default_configs +
++ [ "//build/toolchain/yocto:yocto_flags" ]
+ }
+ set_defaults("source_set") {
+- configs = _chip_defaults.default_configs
++ configs =
++ _chip_defaults.default_configs +
++ [ "//build/toolchain/yocto:yocto_flags" ]
+ }
+ set_defaults("executable") {
+ configs =
+- _chip_defaults.default_configs + _chip_defaults.executable_default_configs
++ _chip_defaults.default_configs +
++ _chip_defaults.executable_default_configs +
++ [ "//build/toolchain/yocto:yocto_flags" ]
+ }
+ set_defaults("shared_library") {
+- configs = _chip_defaults.default_configs
++ configs =
++ _chip_defaults.default_configs +
++ [ "//build/toolchain/yocto:yocto_flags" ]
+ }
+ set_defaults("loadable_module") {
+- configs = _chip_defaults.default_configs
++ configs =
++ _chip_defaults.default_configs +
++ [ "//build/toolchain/yocto:yocto_flags" ]
+ }
diff --git a/meta-oniro-staging/recipes-connectivity/matter/matter/0002-mbedtls-disable-building-integrated-library-in-Yocto.patch b/meta-oniro-staging/recipes-connectivity/matter/matter/0002-mbedtls-disable-building-integrated-library-in-Yocto.patch
new file mode 100644
index 00000000..816b7406
--- /dev/null
+++ b/meta-oniro-staging/recipes-connectivity/matter/matter/0002-mbedtls-disable-building-integrated-library-in-Yocto.patch
@@ -0,0 +1,48 @@
+From 9f7c4a4f4d704ed783dc148969fbe40cc9b6bf1d Mon Sep 17 00:00:00 2001
+From: Robert Drab <robert.drab@huawei.com>
+Date: Wed, 4 Aug 2021 14:00:47 +0200
+Subject: [PATCH] mbedtls: disable building integrated library in Yocto
+
+mbedtls version integrated in projectmatter doesn't compile cleanly with GCC
+v11. It is not required by currently used Linux target but in case it's needed
+version provided by the Yocto build system shall be used instead of this
+integrated one and therefore disabling building of the mbedtls completely.
+
+TODO: Yocto-provided mbedtls should be used instead of integrated one
+
+Upstream-Status: Inappropriate [configuration]
+
+Signed-off-by: Robert Drab <robert.drab@huawei.com>
+---
+ third_party/mbedtls/BUILD.gn | 15 +++++++++++----
+ 1 file changed, 11 insertions(+), 4 deletions(-)
+
+diff --git a/third_party/mbedtls/BUILD.gn b/third_party/mbedtls/BUILD.gn
+index eba5b9a85..722c4f728 100644
+--- a/third_party/mbedtls/BUILD.gn
++++ b/third_party/mbedtls/BUILD.gn
+@@ -17,13 +17,20 @@ declare_args() {
+ mbedtls_target = ""
+ }
+
+-if (mbedtls_target != "") {
++if (current_toolchain == "//build/toolchain/yocto/target:yocto_target") {
+ group("mbedtls") {
+- public_deps = [ mbedtls_target ]
++ # TODO: mbedtls from the Yocto sysroot should be used here instead of the
++ # one integrated into projectmatter; mbedtls is not used for Linux target
+ }
+ } else {
+- import("mbedtls.gni")
++ if (mbedtls_target != "") {
++ group("mbedtls") {
++ public_deps = [ mbedtls_target ]
++ }
++ } else {
++ import("mbedtls.gni")
+
+- mbedtls_target("mbedtls") {
++ mbedtls_target("mbedtls") {
++ }
+ }
+ }
diff --git a/meta-oniro-staging/recipes-connectivity/matter/matter_git.bb b/meta-oniro-staging/recipes-connectivity/matter/matter_git.bb
new file mode 100644
index 00000000..14dac22e
--- /dev/null
+++ b/meta-oniro-staging/recipes-connectivity/matter/matter_git.bb
@@ -0,0 +1,76 @@
+SUMMARY = "Matter"
+DESCRIPTION = "Matter (formerly Project CHIP) is creating more connections \
+ between more objects, simplifying development for manufacturers \
+ and increasing compatibility for consumers, guided by the \
+ Connectivity Standards Alliance (formerly Zigbee Alliance)."
+
+HOMEPAGE = "https://github.com/project-chip/connectedhomeip"
+
+LICENSE = "Apache-2.0 & MIT & BSD-3-Clause & BSD-1-Clause"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327 \
+ file://third_party/pigweed/repo/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+ file://third_party/nlfaultinjection/repo/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+ file://third_party/nlfaultinjection/repo/third_party/nlbuild-autotools/repo/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+ file://third_party/nlfaultinjection/repo/third_party/cstyle/repo/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+ file://third_party/nlunit-test/repo/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+ file://third_party/nlunit-test/repo/third_party/nlbuild-autotools/repo/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+ file://third_party/jsoncpp/repo/LICENSE;md5=5d73c165a0f9e86a1342f32d19ec5926\
+ file://third_party/nlassert/repo/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+ file://third_party/nlassert/repo/third_party/nlbuild-autotools/repo/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+ file://third_party/nlio/repo/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+ file://third_party/nlio/repo/third_party/nlbuild-autotools/repo/LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57 \
+ file://third_party/lwip/repo/lwip/COPYING;md5=59a383b05013356e0c9899b06dc5da3f \
+ file://third_party/jlink/segger_rtt/License.txt;md5=24baa8b9507d8bdedb09af1bd52ab12e \
+ file://third_party/inipp/repo/inipp/LICENSE.txt;md5=2958b7575a79b95a26f7e4b4b86830b6 \
+"
+
+inherit gn pkgconfig
+
+DEPENDS += "avahi glib-2.0-native glib-2.0"
+
+# Matter has over 45 submodules listed, many of them for embedded bare metal
+# SDK's we do not use for our Linux build. Instead using the gitsm fetcher and
+# fetch them recursively, we hand update them here.
+SRC_URI = "git://github.com/project-chip/connectedhomeip.git;protocol=https;name=matter;branch=master \
+ git://github.com/google/pigweed.git;protocol=https;destsuffix=git/third_party/pigweed/repo;name=pigweed;branch=main \
+ git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/third_party/jsoncpp/repo;name=jsoncpp;branch=master \
+ git://github.com/nestlabs/nlfaultinjection.git;protocol=https;destsuffix=git/third_party/nlfaultinjection/repo;name=nlfaultinjection;branch=master \
+ git://github.com/nestlabs/nlunit-test.git;protocol=https;destsuffix=git/third_party/nlunit-test/repo;name=nlunit-test;branch=master \
+ git://github.com/nestlabs/nlassert.git;protocol=https;destsuffix=git/third_party/nlassert/repo;name=nlassert;branch=master \
+ git://github.com/nestlabs/nlio.git;protocol=https;destsuffix=git/third_party/nlio/repo;name=nlio;branch=master \
+ file://0001-projectmatter-use-Yocto-toolchain-and-flags.patch \
+ file://0002-mbedtls-disable-building-integrated-library-in-Yocto.patch \
+ "
+
+PV = "0.0+git${SRCPV}"
+SRCREV_matter = "65440ab4d97ea1dfa5762a3a3a2558f716eb0ef5"
+SRCREV_pigweed = "c4dac15049d9742f0263f09ae9ec452fc57dfeb6"
+SRCREV_jsoncpp = "42e892d96e47b1f6e29844cc705e148ec4856448"
+SRCREV_nlfaultinjection = "e0de0ab4f52c1d1cc7f3948557a1abd0fceeb5ef"
+SRCREV_nlunit-test = "0c8c9073af9c07aa089861295b7d7ced56ad174d"
+SRCREV_nlassert = "c5892c5ae43830f939ed660ff8ac5f1b91d336d3"
+SRCREV_nlio = "0e725502c2b17bb0a0c22ddd4bcaee9090c8fb5c"
+SRCREV_FORMAT = "matter"
+
+S = "${WORKDIR}/git"
+
+# GN does not pick up the python3 wheel native modules and fails with wheel import
+GN_ARGS += "chip_enable_python_modules=false"
+
+# GCC v11 reports multiple problems that span across project's source code and
+# submodules. Temporarily disabling those warnings for the whole project
+TARGET_CFLAGS:append = " -Wno-format-truncation -Wno-stringop-truncation -Wno-format-security"
+
+do_install() {
+ install -d ${D}${bindir}
+ install ${B}/address-resolve-tool ${D}${bindir}
+ install ${B}/chip-cert ${D}${bindir}
+ install ${B}/chip-echo-requester ${D}${bindir}
+ install ${B}/chip-echo-responder ${D}${bindir}
+ install ${B}/chip-im-initiator ${D}${bindir}
+ install ${B}/chip-im-responder ${D}${bindir}
+ install ${B}/chip-shell ${D}${bindir}
+ install ${B}/chip-tool ${D}${bindir}
+ install ${B}/spake2p ${D}${bindir}
+}
--
GitLab