[meta-zephyr] zephyr-image: unify the image generation for tests and samples

Message ID 20220209090510.851933-1-brgl@bgdev.pl
State New
Headers show
Series [meta-zephyr] zephyr-image: unify the image generation for tests and samples | expand

Commit Message

Bartosz Golaszewski Feb. 9, 2022, 9:05 a.m. UTC
From: Bartosz Golaszewski <bartosz.golaszewski@huawei.com>

Reuse the same code that generates zephyr samples for building tests.
This allows us to generate .bin files in all cases.

Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@huawei.com>
---
 .../recipes-kernel/zephyr-kernel/zephyr-image.inc        | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

Patch

diff --git a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
index c77692d..2d4c6ff 100644
--- a/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
+++ b/meta-zephyr-core/recipes-kernel/zephyr-kernel/zephyr-image.inc
@@ -1,17 +1,10 @@ 
-require zephyr-kernel-src.inc
-require zephyr-kernel-common.inc
-
+require zephyr-sample.inc
 inherit testimage
-inherit deploy
 
 QEMU_BIN_PATH = "${STAGING_BINDIR_NATIVE}"
 
 ZEPHYR_BASE = "${S}"
 OECMAKE_SOURCEPATH = "${S}/${ZEPHYR_SRC_DIR}"
 
-do_deploy () {
-    install -D ${B}/zephyr/${ZEPHYR_MAKE_OUTPUT} ${DEPLOYDIR}/${ZEPHYR_IMAGENAME}
-}
-
 addtask deploy after do_compile
 do_install[noexec] = "1"