diff options
| author |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-29 14:36:42 +0000 |
|---|---|---|
| committer |   Robert Yang <liezhi.yang@windriver.com> | 2014-01-26 14:08:13 +0800 |
| commit | 444a8a0b235c0c48685fe84f0c37031906d03921 (patch) | |
| tree | 31945a438209bea0ba26631b61293aed24bc7712 /meta/classes | |
| parent | 3e8776e3fc09ba11867457e0be6b4c3a4a01e2c6 (diff) | |
| download | openembedded-core-contrib-444a8a0b235c0c48685fe84f0c37031906d03921.tar.gz | |
image.bbclass: Depend on virtual/kernel:do_deploy
Now that none of the packagegroups depend on virtual/kernel, we have the problem
that MACHINE=qemumips bitbake core-image-minimal doesn't put a kernel
into the deploy directory. This breaks many common usecases and
user expectations.
To avoid this, add a dependency on the kernel deploy to image do_build tasks.
This should avoid any circular dependency issues but equally ensure users
have their expectations met.
[YOCTO #5581]
(From OE-Core master rev: fe26b2379ecdbdb56acde8592bc0c2d95092a207)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Conflicts:
meta/classes/image.bbclass
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Diffstat (limited to 'meta/classes')
| -rw-r--r-- | meta/classes/image.bbclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass index 7650594f8c..0986858b48 100644 --- a/meta/classes/image.bbclass +++ b/meta/classes/image.bbclass @@ -95,6 +95,8 @@ inherit image-${IMAGE_TYPE_live} IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "vmdk", "empty", d)}' inherit image-${IMAGE_TYPE_vmdk} +do_build[depends] += "virtual/kernel:do_deploy" + python () { deps = " " + imagetypes_getdepends(d) d.appendVarFlag('do_rootfs', 'depends', deps) |