zephyr-kernel: Modify recipes to work with new -DZEPHYR_MODULES

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>
Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
This commit is contained in:
Eilís Ní Fhlannagáin
2022-01-19 15:29:58 +00:00
committed by Naveen Saini
parent ba8905724b
commit e9cada633a
10 changed files with 1 additions and 29 deletions

View File

@@ -1,5 +1,3 @@
include zephyr-sample.inc
ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/coap_client"
ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls"

View File

@@ -1,5 +1,3 @@
include zephyr-sample.inc
ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/coap_server"
ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls"

View File

@@ -1,5 +1,3 @@
include zephyr-sample.inc
ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/echo_client"
ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls"

View File

@@ -2,4 +2,3 @@ include zephyr-sample.inc
ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/http_client"
ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls"

View File

@@ -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)"

View File

@@ -1,5 +1,3 @@
include zephyr-sample.inc
ZEPHYR_SRC_DIR = "${S}/samples/net/mqtt_publisher"
ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls"

View File

@@ -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

View File

@@ -1,5 +1,3 @@
include zephyr-sample.inc
ZEPHYR_SRC_DIR = "${S}/samples/bluetooth/peripheral_esp"
ZEPHYR_MODULES:append = "\;${S}/modules/crypto/tinycrypt"

View File

@@ -1,5 +1,3 @@
include zephyr-sample.inc
ZEPHYR_SRC_DIR = "${S}/samples/bluetooth/peripheral_hr"
ZEPHYR_MODULES:append = "\;${S}/modules/crypto/tinycrypt"

View File

@@ -1,5 +1,3 @@
include zephyr-sample.inc
ZEPHYR_SRC_DIR = "${S}/samples/net/sockets/websocket_client"
ZEPHYR_MODULES:append = "\;${S}/modules/lib/mbedtls"