summaryrefslogtreecommitdiffstats
path: root/meta/classes/populate_sdk_ext.bbclass
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2017-02-07 09:30:50 +1300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-02-07 14:50:09 +0000
commit014278d3701675b3e0aa96eaa9cd3c93c4f68ee2 (patch)
tree664ee47554fdb910e4b986cb3ebdcec74c7c271b /meta/classes/populate_sdk_ext.bbclass
parent1a9f33ccc77f314ed3cf544044fd0059294be5a0 (diff)
downloadpoky-014278d3701675b3e0aa96eaa9cd3c93c4f68ee2.tar.gz
classes/populate_sdk_ext: account for custom image tasks
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. (From OE-Core rev: c966dee6208d3b7a9fa3c1b8aa1266058dcb65ff) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/populate_sdk_ext.bbclass')
-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):
45 sdk_install_targets = d.getVar('SDK_TARGETS') 45 sdk_install_targets = d.getVar('SDK_TARGETS')
46 46
47 depd = d.getVar('BB_TASKDEPDATA', False) 47 depd = d.getVar('BB_TASKDEPDATA', False)
48 tasklist = bb.build.tasksbetween('do_image_complete', 'do_build', d)
49 tasklist.remove('do_build')
48 for v in depd.values(): 50 for v in depd.values():
49 if v[1] == 'do_image_complete': 51 if v[1] in tasklist:
50 if v[0] not in sdk_install_targets: 52 if v[0] not in sdk_install_targets:
51 sdk_install_targets += ' {}'.format(v[0]) 53 sdk_install_targets += ' {}'.format(v[0])
52 54
@@ -630,7 +632,9 @@ def get_ext_sdk_depends(d):
630 deps = d.getVarFlag('do_image_complete', 'deps', False) 632 deps = d.getVarFlag('do_image_complete', 'deps', False)
631 pn = d.getVar('PN') 633 pn = d.getVar('PN')
632 deplist = ['%s:%s' % (pn, dep) for dep in deps] 634 deplist = ['%s:%s' % (pn, dep) for dep in deps]
633 for task in ['do_image_complete', 'do_rootfs', 'do_build']: 635 tasklist = bb.build.tasksbetween('do_image_complete', 'do_build', d)
636 tasklist.append('do_rootfs')
637 for task in tasklist:
634 deplist.extend((d.getVarFlag(task, 'depends') or '').split()) 638 deplist.extend((d.getVarFlag(task, 'depends') or '').split())
635 return ' '.join(deplist) 639 return ' '.join(deplist)
636 640