From fe26b2379ecdbdb56acde8592bc0c2d95092a207 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Nov 2013 14:36:42 +0000 Subject: 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 --- meta/classes/image.bbclass | 2 ++ 1 file changed, 2 insertions(+) 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)) -- cgit 1.2.3-korg