summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWojciech Zmuda <wojciech.zmuda@huawei.com>2020-12-10 16:02:11 +0000
committerNaveen Saini <naveen.kumar.saini@intel.com>2020-12-14 08:16:12 +0800
commit4814135be386e50288e95d156e5de30823b74d39 (patch)
treea8a1e5923c43ad696bfbb7c87e3a5ad866a8780f
parentb74dee01fc18854182c922089bd712f39bb3a9d5 (diff)
downloadmeta-zephyr-4814135be386e50288e95d156e5de30823b74d39.tar.gz
meta-zephyr-4814135be386e50288e95d156e5de30823b74d39.tar.bz2
meta-zephyr-4814135be386e50288e95d156e5de30823b74d39.zip
classes: build zephyr-kernel-test-all for non-qemu boards
Machines not inheriting zephyr-qemuboot did not have IMGDEPLOYDIR variable set, which is required for building zephyr-kernel-test-all. The build was fine for qemu-xxx machines, but for physical boards it failed somewhere inside python code when .join() got an empty argument incoming from IMGDEPLOYDIR. Move IMGDEPLOYDIR to zephyr class, so it's defined for qemu and non-qemu machines. Signed-off-by: Wojciech Zmuda <wojciech.zmuda@huawei.com> Signed-off-by: Naveen Saini <naveen.kumar.saini@intel.com>
-rw-r--r--classes/zephyr-qemuboot.bbclass3
-rw-r--r--classes/zephyr.bbclass3
2 files changed, 3 insertions, 3 deletions
diff --git a/classes/zephyr-qemuboot.bbclass b/classes/zephyr-qemuboot.bbclass
index 39de3f0..5ac1c86 100644
--- a/classes/zephyr-qemuboot.bbclass
+++ b/classes/zephyr-qemuboot.bbclass
@@ -11,9 +11,6 @@ IMAGE_LINK_NAME = "${PN}-image-${MACHINE}"
# Create a link with "-image-" in the name just to keep runqemu happy
QEMU_IMAGE_LINK = "${DEPLOY_DIR_IMAGE}/${PN}-image-${MACHINE}.elf"
-# qemuboot writes into IMGDEPLOYDIR, force to write to DEPLOY_DIR_IMAGE
-IMGDEPLOYDIR = "${DEPLOY_DIR_IMAGE}"
-
CLEANFUNCS += "bootconf_clean"
python bootconf_clean() {
diff --git a/classes/zephyr.bbclass b/classes/zephyr.bbclass
index ead762a..6fceb04 100644
--- a/classes/zephyr.bbclass
+++ b/classes/zephyr.bbclass
@@ -10,6 +10,9 @@ TERMINFO = "${STAGING_DATADIR_NATIVE}/terminfo"
KCONFIG_CONFIG_COMMAND ??= "menuconfig"
ZEPHYR_BOARD ?= "${MACHINE}"
+# qemuboot writes into IMGDEPLOYDIR, force to write to DEPLOY_DIR_IMAGE
+IMGDEPLOYDIR = "${DEPLOY_DIR_IMAGE}"
+
python () {
# Translate MACHINE into Zephyr BOARD
# Zephyr BOARD is basically our MACHINE, except we must use "-" instead of "_"