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>
This commit is contained in:
parent
1a9f33ccc7
commit
014278d370
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in New Issue