From 5e4e7a193991a77838bd0974af7043ca842e5620 Mon Sep 17 00:00:00 2001 From: Andrei Gherzan Date: Thu, 13 May 2021 15:02:08 +0100 Subject: [PATCH] zephyr-qemuboot.bbclass: Remove dependency on qemu-system-native runqemu only really needs the sysroot for qemu-helper-native. Pulling other qemu dependency would get into a racing issue with rm_work. That can also be fixed by tweaking the do_addto_recipe_sysroot order in oe-core for qemu-system-native but that is just not needed for this specific dependency requirement. Signed-off-by: Andrei Gherzan Signed-off-by: Naveen Saini --- classes/zephyr-qemuboot.bbclass | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/classes/zephyr-qemuboot.bbclass b/classes/zephyr-qemuboot.bbclass index f508b45..c268e9e 100644 --- a/classes/zephyr-qemuboot.bbclass +++ b/classes/zephyr-qemuboot.bbclass @@ -36,19 +36,18 @@ python do_bootconf_write() { addtask do_bootconf_write before do_build after do_deploy -# The runqemu script requires the native sysroot populated for the qemu -# recipes. Usually, this is pulled in by a do_image dependency (see -# baremetal-helloworld_git, for example), but in this case, there is no such -# task, so we hook in the dependency to do_bootconf_write. This also ensures -# that builds from sstate will also have this requirement satisfied. +# The runqemu script requires the native sysroot populated for the +# qemu-helper-native recipes. Usually, this is pulled in by a do_image +# dependency (see baremetal-helloworld_git, for example), but in this case, +# there is no such task, so we hook in the dependency to do_bootconf_write. +# This also ensures that builds from sstate will also have this requirement +# satisfied. python () { - # do_addto_recipe_sysroot doesnt exist for all recipes, but we need it to have - # /usr/bin on recipe-sysroot (qemu) populated def extraimage_getdepends(task): deps = "" for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split(): # Make sure we only add it for qemu - if 'qemu' in dep: + if 'qemu-helper-native' in dep: deps += " %s:%s" % (dep, task) return deps d.appendVarFlag('do_bootconf_write', 'depends', extraimage_getdepends('do_addto_recipe_sysroot'))