[meta-zephyr][PATCH v4] zephyr-kernel: Modify recipes to work with new -DZEPHYR_MODULES


Eilís Ní Fhlannagáin
 

From: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>

Some of these recipes ended up overriding the ZEPHYR_MODULES we set
elsewhere. As well, zephyr-lvgl tries to apply a patch we already apply.

Signed-off-by: Eilís Ní Fhlannagáin <elizabeth.flanagan@huawei.com>
---
.../zephyr-kernel/zephyr-coap-client.bb | 2 --
.../zephyr-kernel/zephyr-coap-server.bb | 2 --
.../zephyr-kernel/zephyr-echo-client.bb | 2 --
.../zephyr-kernel/zephyr-http-client.bb | 1 -
.../recipes-kernel/zephyr-kernel/zephyr-lvgl.bb | 12 +-----------
.../zephyr-kernel/zephyr-mqtt-publisher.bb | 2 --
.../zephyr-kernel/zephyr-openthread-echo-client.bb | 3 ---
.../zephyr-kernel/zephyr-peripheral-esp.bb | 2 --
.../zephyr-kernel/zephyr-peripheral-hr.bb | 2 --
.../zephyr-kernel/zephyr-websocket-client.bb | 2 --
10 files changed, 1 insertion(+), 29 deletions(-)

diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb
index 1c79dbe..d7ea837 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-client.bb
@@ -1,5 +1,3 @@
include zephyr-sample.inc

ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/coap_client"
-
-ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb
index 7100f96..dece67d 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-coap-server.bb
@@ -1,5 +1,3 @@
include zephyr-sample.inc

ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/coap_server"
-
-ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb
index e7fcaab..53d1ef3 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-echo-client.bb
@@ -1,5 +1,3 @@
include zephyr-sample.inc

ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/echo_client"
-
-ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb
index d06ad37..bf99bbd 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-http-client.bb
@@ -2,4 +2,3 @@ include zephyr-sample.inc

ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/http_client"

-ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb
index 4f08fc7..efe2154 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb
@@ -1,18 +1,8 @@
include zephyr-sample.inc

ZEPHYR_SRC_DIR = "${S}/samples/subsys/display/lvgl"
-ZEPHYR_MODULES:append = "\;${S}/modules/lib/gui/lvgl\;${S}/modules/debug/segger"

# TODO Once more machines and displays are supported, add a PACKAGECONFIG.
EXTRA_OECMAKE:append =" -DSHIELD=adafruit_2_8_tft_touch_v2"

-SRC_URI:append = " \
- file://0001-cmake-added-missing-file-ext-to.patch;patchdir=modules/lib/gui/lvgl \
- git://github.com/zephyrproject-rtos/segger.git;protocol=https;nobranch=1;destsuffix=git/modules/debug/segger;name=segger \
- git://github.com/zephyrproject-rtos/TraceRecorderSource.git;branch=zephyr;protocol=https;destsuffix=git/modules/debug/TraceRecorder;name=TraceRecorderSource \
-"
-
-SRCREV_segger = "3a52ab222133193802d3c3b4d21730b9b1f1d2f6"
-SRCREV_TraceRecorderSource = "36c577727642457b0db7274298a4b96558374832"
-
-COMATIBLE_MACHINE = "(nrf52840dk-nrf52840)"
+COMPATIBLE_MACHINE = "(nrf52840dk-nrf52840)"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb
index 02b3c16..c679798 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-mqtt-publisher.bb
@@ -1,5 +1,3 @@
include zephyr-sample.inc

ZEPHYR_SRC_DIR = "${S}/samples/net/mqtt_publisher"
-
-ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb
index 88922b8..b83c6b3 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-echo-client.bb
@@ -2,9 +2,6 @@ include zephyr-sample.inc

ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/echo_client"

-ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls"
-ZEPHYR_MODULES:append = "\;${S}/modules/lib/openthread"
-
EXTRA_OECMAKE += "-DOVERLAY_CONFIG=overlay-ot.conf"

# The overlay config and OpenThread itself imposes some specific requirements
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
index 045ea36..14655e5 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-esp.bb
@@ -1,5 +1,3 @@
include zephyr-sample.inc

ZEPHYR_SRC_DIR = "${S}/samples/bluetooth/peripheral_esp"
-
-ZEPHYR_MODULES:append = "\;${S}/modules/crypto/tinycrypt"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb
index 64fd0ec..53fc771 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-peripheral-hr.bb
@@ -1,5 +1,3 @@
include zephyr-sample.inc

ZEPHYR_SRC_DIR = "${S}/samples/bluetooth/peripheral_hr"
-
-ZEPHYR_MODULES:append = "\;${S}/modules/crypto/tinycrypt"
diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb
index 85f2cda..c2c47d0 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-websocket-client.bb
@@ -1,5 +1,3 @@
include zephyr-sample.inc

ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/websocket_client"
-
-ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls"
--
2.25.1