diff options
-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 () { | |||
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 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 = "" | |||
21 | # Use a common kernel recipe for all QEMU machines | 21 | # Use a common kernel recipe for all QEMU machines |
22 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" | 22 | PREFERRED_PROVIDER_virtual/kernel ??= "linux-yocto" |
23 | 23 | ||
24 | EXTRA_IMAGEDEPENDS += "qemu-system-native qemu-helper-native" | 24 | EXTRA_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 |
27 | KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" | 27 | KERNEL_FEATURES:append:pn-linux-yocto = " features/nfsd/nfsd-enable.scc" |