aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-01-25 09:22:48 +1300
committerPaul Eggleton <paul.eggleton@linux.intel.com>2017-02-07 09:23:33 +1300
commit8cb42f39f3a882e51a0456278ae5ebe31997e28a (patch)
treee3e1c899b7d372d4194960fdae50b7fb4bac8b2f
parent8dcf30d04d29fe27743ae28077c054dfc52471f1 (diff)
downloadopenembedded-core-contrib-paule/esdk-fixes4.tar.gz
openembedded-core-contrib-paule/esdk-fixes4.tar.bz2
openembedded-core-contrib-paule/esdk-fixes4.zip
classes/populate_sdk_ext: account for custom image taskspaule/esdk-fixes4
Any custom tasks that were added on the image between do_image_complete and do_build were not being taken into account. Use the newly added bb.build.tasksbetween() function to take care of that. Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
-rw-r--r--meta/classes/populate_sdk_ext.bbclass8
1 files changed, 6 insertions, 2 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index 4eda06b6f4..95b3d23112 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -45,8 +45,10 @@ def get_sdk_install_targets(d, images_only=False):
sdk_install_targets = d.getVar('SDK_TARGETS')
depd = d.getVar('BB_TASKDEPDATA', False)
+ tasklist = bb.build.tasksbetween('do_image_complete', 'do_build', d)
+ tasklist.remove('do_build')
for v in depd.values():
- if v[1] == 'do_image_complete':
+ if v[1] in tasklist:
if v[0] not in sdk_install_targets:
sdk_install_targets += ' {}'.format(v[0])
@@ -630,7 +632,9 @@ def get_ext_sdk_depends(d):
deps = d.getVarFlag('do_image_complete', 'deps', False)
pn = d.getVar('PN')
deplist = ['%s:%s' % (pn, dep) for dep in deps]
- for task in ['do_image_complete', 'do_rootfs', 'do_build']:
+ tasklist = bb.build.tasksbetween('do_image_complete', 'do_build', d)
+ tasklist.append('do_rootfs')
+ for task in tasklist:
deplist.extend((d.getVarFlag(task, 'depends') or '').split())
return ' '.join(deplist)