aboutsummaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-29 14:36:42 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-11-29 16:26:56 +0000
commitfe26b2379ecdbdb56acde8592bc0c2d95092a207 (patch)
tree89e22229c3b437d56736087166c56abea0c16cce /meta
parent3afbe58fb79bc204553c7e2a076efb26e3b1ca22 (diff)
downloadopenembedded-core-contrib-fe26b2379ecdbdb56acde8592bc0c2d95092a207.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] Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/image.bbclass2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 8217fb3254..cc65e3566d 100644
--- a/meta/classes/image.bbclass
+++ b/meta/classes/image.bbclass
@@ -90,6 +90,8 @@ do_rootfs[depends] += "makedevs-native:do_populate_sysroot virtual/fakeroot-nati
do_rootfs[depends] += "virtual/update-alternatives-native:do_populate_sysroot update-rc.d-native:do_populate_sysroot"
do_rootfs[recrdeptask] += "do_packagedata"
+do_build[depends] += "virtual/kernel:do_deploy"
+
def build_live(d):
if base_contains("IMAGE_FSTYPES", "live", "live", "0", d) == "0": # live is not set but hob might set iso or hddimg
d.setVar('NOISO', base_contains('IMAGE_FSTYPES', "iso", "0", "1", d))