diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-11-29 14:36:42 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-02-09 11:04:12 +0000 |
commit | 6241dcf76583baabbf6ef921f89470ba0d10f464 (patch) | |
tree | b30d9a6a4e0c2d69a19b755d80f51c3edf8c3185 /meta/classes | |
parent | ef00c0c0b5d1c2843d96177862605f27502f2349 (diff) | |
download | poky-6241dcf76583baabbf6ef921f89470ba0d10f464.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)
(From OE-Core rev: 444a8a0b235c0c48685fe84f0c37031906d03921)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Conflicts:
meta/classes/image.bbclass
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
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} | |||
95 | IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "vmdk", "empty", d)}' | 95 | IMAGE_TYPE_vmdk = '${@base_contains("IMAGE_FSTYPES", "vmdk", "vmdk", "empty", d)}' |
96 | inherit image-${IMAGE_TYPE_vmdk} | 96 | inherit image-${IMAGE_TYPE_vmdk} |
97 | 97 | ||
98 | do_build[depends] += "virtual/kernel:do_deploy" | ||
99 | |||
98 | python () { | 100 | python () { |
99 | deps = " " + imagetypes_getdepends(d) | 101 | deps = " " + imagetypes_getdepends(d) |
100 | d.appendVarFlag('do_rootfs', 'depends', deps) | 102 | d.appendVarFlag('do_rootfs', 'depends', deps) |