From 6241dcf76583baabbf6ef921f89470ba0d10f464 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Fri, 29 Nov 2013 14:36:42 +0000 Subject: [PATCH] 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 Conflicts: meta/classes/image.bbclass Signed-off-by: Robert Yang 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 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)