diff options
| author |   Paul Eggleton <paul.eggleton@linux.intel.com> | 2016-06-29 15:13:51 +1200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-08 09:55:40 +0100 |
| commit | 2b9c092e89b421bf7fd6a7c9604a83ae420d85ba (patch) | |
| tree | 931b056343deb5b1582726575ff11c974f8bedd5 | |
| parent | 397b76c7f26e38e761b94b1f7987aafd55048e10 (diff) | |
| download | openembedded-core-contrib-2b9c092e89b421bf7fd6a7c9604a83ae420d85ba.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].
Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
| -rw-r--r-- | meta/classes/populate_sdk_ext.bbclass | 8 |
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() { } def get_ext_sdk_depends(d): - return d.getVarFlag('do_rootfs', 'depends', True) + ' ' + d.getVarFlag('do_build', 'depends', True) + # Note: the deps varflag is a list not a string, so we need to specify expand=False + deps = d.getVarFlag('do_image_complete', 'deps', False) + pn = d.getVar('PN', True) + deplist = ['%s:%s' % (pn, dep) for dep in deps] + for task in ['do_image_complete', 'do_rootfs', 'do_build']: + deplist.extend((d.getVarFlag(task, 'depends', True) or '').split()) + return ' '.join(deplist) python do_sdk_depends() { # We have to do this separately in its own task so we avoid recursing into |