diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-06-13 10:38:16 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-07-02 16:44:42 +0100 |
| commit | fa13e83ec3f91dce866ac212e91b62db24b6486d (patch) | |
| tree | 4f35524825b215fb97e3afeffd0aa462ac15b894 /meta/classes | |
| parent | ff3f912eed0270afa14d706fc1e57f8a1de2614b (diff) | |
| download | openembedded-core-fa13e83ec3f91dce866ac212e91b62db24b6486d.tar.gz openembedded-core-fa13e83ec3f91dce866ac212e91b62db24b6486d.tar.bz2 openembedded-core-fa13e83ec3f91dce866ac212e91b62db24b6486d.zip | |
EXTRA_IMAGEDEPENDS is used to ensure things like qemu-native are built and
these are not strictly dependencies of the do_rootfs task. This patch
moves them to the do_build task allowing bitbake a little more flexibility
about when things need to get built by.
I noticed this when qemu-native failed to build and a rootfs was not generated
which is not the intended behaviour.
Also update the syntax to use appendVarFlag instead of get/setVarFlag
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/image.bbclass | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 0772363f18..7e4bb696cf 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -81,11 +81,13 @@ IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "vmdk", "empty", d) inherit image-${IMAGE_TYPE_vmdk} python () { - deps = d.getVarFlag('do_rootfs', 'depends') or "" - deps += imagetypes_getdepends(d) + deps = " " + imagetypes_getdepends(d) + d.appendVarFlag('do_rootfs', 'depends', deps) + + deps = "" for dep in (d.getVar('EXTRA_IMAGEDEPENDS', True) or "").split(): deps += " %s:do_populate_sysroot" % dep - d.setVarFlag('do_rootfs', 'depends', deps) + d.appendVarFlag('do_build', 'depends', deps) # If we don't do this we try and run the mapping hooks while parsing which is slow # bitbake should really provide something to let us know this... |