summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorPaul Eggleton <paul.eggleton@linux.intel.com>2016-06-29 15:13:51 +1200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-08 09:57:24 +0100
commitc7ab9f3ca15f7067e637f8e981b74dc05d7a9a55 (patch)
tree8f0cd5543685e8d35f2595441830d5bf43e1870a /meta
parent1063622cc6cd6132ede94449954d23ad85028620 (diff)
downloadpoky-c7ab9f3ca15f7067e637f8e981b74dc05d7a9a55.tar.gz
classes/populate_sdk_ext: ensure tasks to build the image are included
If you build an extensible SDK for an image and IMAGE_FSTYPES includes "live" then the extensible SDK will fail to install with a bunch of unexpected task execution errors, matching the missing items required to build the live image. The issue was we were still depending on do_rootfs rather than do_image_complete. The fix was slightly more complicated than just changing the task name as do_image_complete's dependencies are in the form of dependencies on tasks within the same recipe (represented in the "deps" varflag rather than the "depends" varflag). Fixes [YOCTO #9826]. (From OE-Core rev: 2b9c092e89b421bf7fd6a7c9604a83ae420d85ba) Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/populate_sdk_ext.bbclass8
1 files changed, 7 insertions, 1 deletions
diff --git a/meta/classes/populate_sdk_ext.bbclass b/meta/classes/populate_sdk_ext.bbclass
index df39ff60f1..cddc306514 100644
--- a/meta/classes/populate_sdk_ext.bbclass
+++ b/meta/classes/populate_sdk_ext.bbclass
@@ -450,7 +450,13 @@ fakeroot python do_populate_sdk_ext() {
450} 450}
451 451
452def get_ext_sdk_depends(d): 452def get_ext_sdk_depends(d):
453 return d.getVarFlag('do_rootfs', 'depends', True) + ' ' + d.getVarFlag('do_build', 'depends', True) 453 # Note: the deps varflag is a list not a string, so we need to specify expand=False
454 deps = d.getVarFlag('do_image_complete', 'deps', False)
455 pn = d.getVar('PN', True)
456 deplist = ['%s:%s' % (pn, dep) for dep in deps]
457 for task in ['do_image_complete', 'do_rootfs', 'do_build']:
458 deplist.extend((d.getVarFlag(task, 'depends', True) or '').split())
459 return ' '.join(deplist)
454 460
455python do_sdk_depends() { 461python do_sdk_depends() {
456 # We have to do this separately in its own task so we avoid recursing into 462 # We have to do this separately in its own task so we avoid recursing into