summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-19 17:03:48 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-09-23 12:49:11 (GMT)
commit282d596b8cc81d650b6d20c6131fdc236bad2c20 (patch)
tree15874f01fd6f4152f84dec3bdb56078f528a29df
parentbea6a00da348e7e30546c39bc60a58b7f4b71e1f (diff)
downloadpoky-282d596b8cc81d650b6d20c6131fdc236bad2c20.tar.gz
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.bbclass5
-rw-r--r--meta/conf/machine/include/qemu.inc2
2 files changed, 5 insertions, 2 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index d768951..1d88ccd 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -138,7 +138,10 @@ python () {
138 def extraimage_getdepends(task): 138 def extraimage_getdepends(task):
139 deps = "" 139 deps = ""
140 for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split(): 140 for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split():
141 deps += " %s:%s" % (dep, task) 141 if ":" in dep:
142 deps += " %s " % (dep)
143 else:
144 deps += " %s:%s" % (dep, task)
142 return deps 145 return deps
143 146
144 d.appendVarFlag('do_image_complete', 'depends', extraimage_getdepends('do_populate_sysroot')) 147 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 c7136da..642c322 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -21,7 +21,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
21# Use a common kernel recipe for all QEMU machines 21# Use a common kernel recipe for all QEMU machines
22PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" 22PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto"
23 23
24EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native" 24EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native:do_addto_recipe_sysroot"
25 25
26# Provide the nfs server kernel module for all qemu images 26# Provide the nfs server kernel module for all qemu images
27KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" 27KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc"