summaryrefslogtreecommitdiffstats
path: root/meta/classes
diff options
context:
space:
mode:
authorAlejandro Hernandez Samaniego <alejandro@enedino.org>2021-10-07 02:42:05 -0600
committerRichard Purdie <richard.purdie@linuxfoundation.org>2021-10-08 16:44:00 +0100
commit1c0c82f8babc1b3b00841de41501375692cdaddd (patch)
tree5cb62621079163f213c8eb94fcfe37080aee9511 /meta/classes
parent37258c4567e6405c6b26e02be2b5283b82f7c13a (diff)
downloadpoky-1c0c82f8babc1b3b00841de41501375692cdaddd.tar.gz
baremetal-image: Fix do_image dependencies
Commit 282d596b8 added a fix for image.bbclass related to QEMU dependencies, such fix made the older logic borrowed from image.bbclass incompatible. Update the dependency logic to reflect new changes, we no longer need to add the do_addto_recipe_sysroot dependency specifically. (From OE-Core rev: 4663f06c81285aeab8e8d33ec5338d7854b9dd9f) Signed-off-by: Alejandro Enedino Hernandez Samaniego <alejandro@enedino.org> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
-rw-r--r--meta/classes/baremetal-image.bbclass10
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
105python(){ 105python(){
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}