diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-19 18:03:48 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2021-09-23 13:49:11 +0100 |
| commit | 282d596b8cc81d650b6d20c6131fdc236bad2c20 (patch) | |
| tree | 15874f01fd6f4152f84dec3bdb56078f528a29df | |
| parent | bea6a00da348e7e30546c39bc60a58b7f4b71e1f (diff) | |
| download | poky-282d596b8cc81d650b6d20c6131fdc236bad2c20.tar.gz poky-282d596b8cc81d650b6d20c6131fdc236bad2c20.tar.bz2 poky-282d596b8cc81d650b6d20c6131fdc236bad2c20.zip | |
image/qemu: Add explict depends for qemu-helper addto_recipe_sysroot task
The populate_sysroot task isn't enough for qemu-helper-native, we need
it's addto_recipe_sysroot task. This corrects what amounts to bad
dependency information to be explicit.
(From OE-Core rev: 55623420208bc4c77a61492d2bbcbc71d3123acd)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | meta/classes/image.bbclass | 5 | ||||
| -rw-r--r-- | meta/conf/machine/include/qemu.inc | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index d76895178f..1d88ccd819 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -138,7 +138,10 @@ python () { def extraimage_getdepends(task): deps = "" for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split(): - deps += " %s:%s" % (dep, task) + if ":" in dep: + deps += " %s " % (dep) + else: + deps += " %s:%s" % (dep, task) return deps d.appendVarFlag('do_image_complete', 'depends', extraimage_getdepends('do_populate_sysroot')) diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc index c7136da711..642c322abc 100644 --- a/meta/conf/machine/include/qemu.inc +++ b/meta/conf/machine/include/qemu.inc @@ -21,7 +21,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base = "" # Use a common kernel recipe for all QEMU machines PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" -EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native" +EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native:do_addto_recipe_sysroot" # Provide the nfs server kernel module for all qemu images KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" |