Patchwork image.bbclass: Depend on virtual/kernel:do_deploy

login
register
mail settings
Submitter Richard Purdie
Date Nov. 29, 2013, 2:36 p.m.
Message ID <1385735802.11222.62.camel@ted>
Download mbox | patch
Permalink /patch/62621/
State Accepted
Commit 32c5d84823de336163a4aeceeb390afc48eeaad6
Headers show

Comments

Richard Purdie - Nov. 29, 2013, 2:36 p.m.
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.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
Martin Jansa - Nov. 29, 2013, 3:38 p.m.
On Fri, Nov 29, 2013 at 02:36:42PM +0000, Richard Purdie wrote:
> 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.

Acked-By: Martin Jansa <Martin.Jansa@gmail.com>

> 
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
> ---
> diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
> index 8217fb3..cc65e35 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))
> 
> 
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core

Patch

diff --git a/meta/classes/image.bbclass b/meta/classes/image.bbclass
index 8217fb3..cc65e35 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))