diff options
-rw-r--r-- | meta/classes/baremetal-image.bbclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/classes/baremetal-image.bbclass b/meta/classes/baremetal-image.bbclass index 089c445522..81f5e5e93d 100644 --- a/meta/classes/baremetal-image.bbclass +++ b/meta/classes/baremetal-image.bbclass | |||
@@ -105,13 +105,17 @@ inherit qemuboot | |||
105 | python(){ | 105 | python(){ |
106 | # do_addto_recipe_sysroot doesnt exist for all recipes, but we need it to have | 106 | # do_addto_recipe_sysroot doesnt exist for all recipes, but we need it to have |
107 | # /usr/bin on recipe-sysroot (qemu) populated | 107 | # /usr/bin on recipe-sysroot (qemu) populated |
108 | # The do_addto_recipe_sysroot dependency is coming from EXTRA_IMAGDEPENDS now, | ||
109 | # we just need to add the logic to add its dependency to do_image. | ||
108 | def extraimage_getdepends(task): | 110 | def extraimage_getdepends(task): |
109 | deps = "" | 111 | deps = "" |
110 | for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split(): | 112 | for dep in (d.getVar('EXTRA_IMAGEDEPENDS') or "").split(): |
111 | # Make sure we only add it for qemu | 113 | # Make sure we only add it for qemu |
112 | if 'qemu' in dep: | 114 | if 'qemu' in dep: |
113 | deps += " %s:%s" % (dep, task) | 115 | if ":" in dep: |
116 | deps += " %s " % (dep) | ||
117 | else: | ||
118 | deps += " %s:%s" % (dep, task) | ||
114 | return deps | 119 | return deps |
115 | d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_addto_recipe_sysroot')) | 120 | d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_populate_sysroot')) |
116 | d.appendVarFlag('do_image', 'depends', extraimage_getdepends('do_populate_sysroot')) | ||
117 | } | 121 | } |