mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-31 00:39:46 +00:00
Code Issues Projects Releases Wiki Activity

classes/populate_sdk_ext: account for custom image tasks

Browse Source 
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:
Paul Eggleton
2017-02-07 09:30:50 +13:00
committed by Richard Purdie
parent 1a9f33ccc7
commit 014278d370
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/populate_sdk_ext.bbclass
+6 -2
View File
@@ -45,8 +45,10 @@ def get_sdk_install_targets(d, images_only=False):
sdk_install_targets = d.getVar('SDK_TARGETS') sdk_install_targets = d.getVar('SDK_TARGETS')
depd = d.getVar('BB_TASKDEPDATA', False) 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(): for v in depd.values():
if v[1] == 'do_image_complete': if v[1] in tasklist:
if v[0] not in sdk_install_targets: if v[0] not in sdk_install_targets:
sdk_install_targets += ' {}'.format(v[0]) sdk_install_targets += ' {}'.format(v[0])
@@ -630,7 +632,9 @@ def get_ext_sdk_depends(d):
deps = d.getVarFlag('do_image_complete', 'deps', False) deps = d.getVarFlag('do_image_complete', 'deps', False)
pn = d.getVar('PN') pn = d.getVar('PN')
deplist = ['%s:%s' % (pn, dep) for dep in deps] 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()) deplist.extend((d.getVarFlag(task, 'depends') or '').split())
return ' '.join(deplist) return ' '.join(deplist)