| Message ID | 20250811145941.2553838-12-sandeep.gundlupet-raju@amd.com |
|---|---|
| State | New |
| Headers | show |
| Series | Update for scarthgap release | expand |
diff --git a/meta-zephyr-bsp/recipes-meta/meta/generate-zephyr-machines.bb b/meta-zephyr-bsp/recipes-meta/meta/generate-zephyr-machines.bb index 30d362c..a52ffba 100644 --- a/meta-zephyr-bsp/recipes-meta/meta/generate-zephyr-machines.bb +++ b/meta-zephyr-bsp/recipes-meta/meta/generate-zephyr-machines.bb @@ -2,11 +2,11 @@ # SPDX-License-Identifier: Apache-2.0 FILESEXTRAPATHS:prepend := "${THISDIR}/files:" -ZEPHYR_INHERIT_CLASSES += "zephyr cmake" +ZEPHYR_INHERIT_CLASSES += "zephyr cmake zephyr-sample" inherit ${ZEPHYR_INHERIT_CLASSES} -require recipes-kernel/zephyr-kernel/zephyr-sample.inc +#require recipes-kernel/zephyr-kernel/zephyr-sample.inc SRC_URI:append = " file://0001-zephyr-Export-an-OpenEmbedded-machine-config.patch" diff --git a/meta-zephyr-core/classes-recipe/zephyr-sample.bbclass b/meta-zephyr-core/classes-recipe/zephyr-sample.bbclass new file mode 100644 index 0000000..b2a71db --- /dev/null +++ b/meta-zephyr-core/classes-recipe/zephyr-sample.bbclass @@ -0,0 +1,10 @@ +# +# Copyright (C) 2025, Advanced Micro Devices, Inc. All rights reserved. +# +# SPDX-License-Identifier: MIT +# +# This bbclass is inherity by all the zephyr-kernel/zephyr-<apps>.bb recipes +# to build zephyr applications. User can also inherit this bbclass from any +# layer for custom or out-of-tree zephyr applications. + +require recipes-kernel/zephyr-kernel/zephyr-image.inc diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb index c2a1e55..78a6e83 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-blinky.bb @@ -1,3 +1,3 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/basic/blinky" 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 7796f6b..aa020e9 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,3 +1,3 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/sockets/coap_client" 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 5e345d4..b43143a 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,3 +1,3 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/sockets/coap_server" 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 73187cf..4705724 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,3 +1,3 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/sockets/echo_client" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb index ebc6dc3..f95f544 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb @@ -1,4 +1,4 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/bluetooth/hci_uart" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-helloworld.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-helloworld.bb index 68b42aa..637287b 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-helloworld.bb +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-helloworld.bb @@ -2,6 +2,6 @@ SUMMARY = "Hello World Zephyr Sample" DESCRIPTION = "A simple Zephyr application that prints 'Hello World' on the \ console" -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/hello_world" 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 8bff2be..a4bf7f2 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 @@ -1,4 +1,4 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/sockets/http_client" 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 a635da2..3878937 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-lvgl.bb @@ -1,4 +1,4 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/subsys/display/lvgl" 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 f314841..fae7eb4 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,3 +1,3 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/mqtt_publisher" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb index 5e51c23..2932b53 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openamp-rsc-table.bb @@ -1,4 +1,4 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_MAKE_OUTPUT = "zephyr_openamp_rsc_table.elf" 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 e2b3efd..0408d92 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 @@ -1,4 +1,4 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/sockets/echo_client" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-rcp.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-rcp.bb index d745e85..e1f1646 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-rcp.bb +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-openthread-rcp.bb @@ -1,4 +1,4 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/openthread/coprocessor" 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 0aac7f6..61829bb 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,3 +1,3 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/bluetooth/peripheral_esp" 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 80e3505..2c0fcb9 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,3 +1,3 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/bluetooth/peripheral_hr" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philosophers.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philosophers.bb index 2b4fca3..931541e 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philosophers.bb +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-philosophers.bb @@ -3,6 +3,6 @@ DESCRIPTION = "A simple Zephyr application that demonstrates basic sanity of \ the kernel. It demonstrates that kernel scheduling, communication and timing \ operate correctly by printing a greeting to the console from two threads." -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/philosophers" diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc deleted file mode 100644 index 5f6dea9..0000000 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc +++ /dev/null @@ -1 +0,0 @@ -require zephyr-image.inc diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-synchronization.bb b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-synchronization.bb index a55736b..217ab7d 100644 --- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-synchronization.bb +++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-synchronization.bb @@ -3,6 +3,6 @@ DESCRIPTION = "A simple Zephyr application that demonstrates basic sanity of \ the kernel. It demonstrates that kernel scheduling, communication and timing \ operate correctly by printing a greeting to the console from two threads." -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/synchronization" 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 b92e986..b646b6d 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,3 +1,3 @@ -include zephyr-sample.inc +inherit zephyr-sample ZEPHYR_SRC_DIR = "${ZEPHYR_BASE}/samples/net/sockets/websocket_client"
Convert recipes-kernel/zephyr-kernel/zephyr-sample.inc file to classes-recipe/zephyr-sample.bbclass. Using this bbclass user can inherit this bbclass from any layer to build custom or out-of-tree zephyr applications. Also update the recipes to inherit zephyr-sample bbclass. Signed-off-by: Sandeep Gundlupet Raju <sandeep.gundlupet-raju@amd.com> --- .../recipes-meta/meta/generate-zephyr-machines.bb | 4 ++-- meta-zephyr-core/classes-recipe/zephyr-sample.bbclass | 10 ++++++++++ .../recipes-kernel/zephyr-kernel/zephyr-blinky.bb | 2 +- .../recipes-kernel/zephyr-kernel/zephyr-coap-client.bb | 2 +- .../recipes-kernel/zephyr-kernel/zephyr-coap-server.bb | 2 +- .../recipes-kernel/zephyr-kernel/zephyr-echo-client.bb | 2 +- .../recipes-kernel/zephyr-kernel/zephyr-hci-uart.bb | 2 +- .../recipes-kernel/zephyr-kernel/zephyr-helloworld.bb | 2 +- .../recipes-kernel/zephyr-kernel/zephyr-http-client.bb | 2 +- .../recipes-kernel/zephyr-kernel/zephyr-lvgl.bb | 2 +- .../zephyr-kernel/zephyr-mqtt-publisher.bb | 2 +- .../zephyr-kernel/zephyr-openamp-rsc-table.bb | 2 +- .../zephyr-kernel/zephyr-openthread-echo-client.bb | 2 +- .../zephyr-kernel/zephyr-openthread-rcp.bb | 2 +- .../zephyr-kernel/zephyr-peripheral-esp.bb | 2 +- .../zephyr-kernel/zephyr-peripheral-hr.bb | 2 +- .../zephyr-kernel/zephyr-philosophers.bb | 2 +- .../recipes-kernel/zephyr-kernel/zephyr-sample.inc | 1 - .../zephyr-kernel/zephyr-synchronization.bb | 2 +- .../zephyr-kernel/zephyr-websocket-client.bb | 2 +- 20 files changed, 29 insertions(+), 20 deletions(-) create mode 100644 meta-zephyr-core/classes-recipe/zephyr-sample.bbclass delete mode 100644 meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-sample.inc