Skip to contentSkip to conversation

zephyr.conf: Enable uninative

PATCH New Naveen Saini 1 participant 2 messages Dec 12, 2019

lore
Share & tools
lore
#0 lore raw

PATCH 1/2 zephyr.conf: Enable uninative

Use uninative by default to allow to build multiple distro and re-use sstate cache

---
 conf/distro/zephyr.conf | 2 ++
 1 file changed, 2 insertions(+)
conf/distro/zephyr.conf +2 -0
index 580ae2a..673152f 100644
@@ -14,3 +14,5 @@ TEST_SUITES = "zephyr"
 TOOLCHAIN_TARGET_TASK += " newlib"
 INHERIT += "siteinfo-zephyr"
 
+INHERIT += "uninative"
+require conf/distro/include/yocto-uninative.inc
Signature · 1 line
2.17.1
#1 lore raw

PATCH 2/2 zephy-kernel-test: update the testcase list for x86

Updated the test recipes to build against Zephyr v2.0 Code clean up

---
 classes/zephyrtest.bbclass                    |  2 +-
 recipes-kernel/zephyr-kernel/zephyr-image.inc |  9 +-
 .../zephyr-kernel/zephyr-kernel-test-all.bb   |  1 -
 .../zephyr-kernel/zephyr-kernel-test.inc      | 89 ++++++++++---------
 4 files changed, 53 insertions(+), 48 deletions(-)
classes/zephyrtest.bbclass +1 -1
index 8a051db..3acc4c3 100644
@@ -14,7 +14,7 @@ python zephyrtest_virtclass_handler () {
     e.data.setVar("ZEPHYR_IMAGENAME", pn + ".elf")
 
     # Most tests for Zephyr 1.6 are in the "legacy" folder
-    e.data.setVar("ZEPHYR_IMAGE_SRCDIR", "tests/legacy/kernel/" + variant)
+    e.data.setVar("ZEPHYR_SRC_DIR", "tests/kernel/" + variant)
     e.data.setVar("ZEPHYR_MAKE_OUTPUT", "zephyr.elf")
 
     # Allow to build using both foo-some_test form as well as foo-some-test
recipes-kernel/zephyr-kernel/zephyr-image.inc +3 -6
index cf57dbf..e8b8871 100644
@@ -7,14 +7,11 @@ inherit deploy
 QEMU_BIN_PATH = "${STAGING_BINDIR_NATIVE}"
 
 ZEPHYR_BASE = "${S}"
-
-do_compile () {
-    cd ${S}
-     oe_runmake ${ZEPHYR_MAKE_ARGS} -C ${ZEPHYR_IMAGE_SRCDIR}
-}
+OECMAKE_SOURCEPATH = "${S}/${ZEPHYR_SRC_DIR}"
 
 do_deploy () {
-    install -D ${ZEPHYR_IMAGE_SRCDIR}/outdir/${BOARD}/${ZEPHYR_MAKE_OUTPUT} ${DEPLOYDIR}/${ZEPHYR_IMAGENAME}
+    install -D ${B}/zephyr/${ZEPHYR_MAKE_OUTPUT} ${DEPLOYDIR}/${ZEPHYR_IMAGENAME}
 }
 
 addtask deploy after do_compile
+do_install[noexec] = "1"
recipes-kernel/zephyr-kernel/zephyr-kernel-test-all.bb +0 -1
index c45124a..85efd24 100644
@@ -4,7 +4,6 @@ INHIBIT_DEFAULT_DEPS = "1"
 require zephyr-kernel-test.inc
 
 addtask testimage
-deltask configure
 deltask compile
 deltask install
 
recipes-kernel/zephyr-kernel/zephyr-kernel-test.inc +49 -40

101 lines not on this page · raw message

Signature · 1 line
2.17.1