CaROS/poky
3
1
Fork 0
mirror of https://git.yoctoproject.org/git/poky synced 2026-01-04 16:10:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

image/qemu: Add explict depends for qemu-helper addto_recipe_sysroot task

Browse Source 
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>
This commit is contained in:
Richard Purdie 2021-09-19 18:03:48 +01:00
parent bea6a00da3
commit 282d596b8c
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
meta/classes/image.bbclass
View File

@ -138,7 +138,10 @@ python () {
def extraimage_getdepends(task): def extraimage_getdepends(task):
deps = "" deps = ""
for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split(): 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 return deps
d.appendVarFlag('do_image_complete', 'depends', extraimage_getdepends('do_populate_sysroot')) d.appendVarFlag('do_image_complete', 'depends', extraimage_getdepends('do_populate_sysroot'))

2
meta/conf/machine/include/qemu.inc
View File

@ -21,7 +21,7 @@ RDEPENDS:${KERNEL_PACKAGE_NAME}-base = ""
# Use a common kernel recipe for all QEMU machines # Use a common kernel recipe for all QEMU machines
PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" 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 # Provide the nfs server kernel module for all qemu images
KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc"