[PATCH 0/1] linux-libc-headers-yocto: disable device tree generation

[PATCH 0/1] linux-libc-headers-yocto: disable device tree generation

[Bruce Ashfield]

Richard/Saul,

This fixed the error picked up overnight where the libc-headers
fails because there is no dtb to install.

Note: this could have been fixed by factoring out the include
of linux-dtb.inc into the individual recipes rather than by
modifying the libc-headers rule to set the KERNEL_DEVICETREE
to nothing. But the libc-headers is the exception and most 
any other recipe that includes linux-yocto.inc needs this
enabled, so I opted to leave the includes as they were.

Pull URL: git://git.pokylinux.org/poky-contrib.git
  Branch: zedd/kernel
  Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel

Thanks,
    Bruce Ashfield <bruce.ashfield@windriver.com>
---


Bruce Ashfield (1):
  linux-libc-headers-yocto: disable device tree generation

 .../linux-libc-headers-yocto_git.bb                |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

[PATCH 1/1] linux-libc-headers-yocto: disable device tree generation

[Bruce Ashfield]

Fixes [BUGID #719]

The common routines for handling a git based yocto kernel
are included from the lib headers recipe to checkout the
appropriate branch of the kernel for header generation.

linux-yocto.inc includes device tree installation rules
which typically apply to a kernel user of the include file,
but do not apply to a simple header generation. The fix is
to override the DTB variables in this recipe, which disable
the device tree installation rules.

Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
---
 .../linux-libc-headers-yocto_git.bb                |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
index 0d58354..736d60f 100644
--- a/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
+++ b/meta/recipes-kernel/linux-libc-headers/linux-libc-headers-yocto_git.bb
@@ -12,6 +12,10 @@ PR = "r2"
 SRCREV_FORMAT = "meta_machine"
 SRC_URI = "git://git.pokylinux.org/linux-yocto-2.6.37;protocol=git;nocheckout=1;branch=${KBRANCH},meta;name=machine,meta"
 
+# force this to empty to prevent installation failures, we aren't
+# building a device tree as part of kern headers
+KERNEL_DEVICETREE=
+
 set_arch() {
 	case ${TARGET_ARCH} in
 		arm*)     ARCH=arm ;;
-- 
1.7.0.4

Re: [PATCH 0/1] linux-libc-headers-yocto: disable device tree generation

[Richard Purdie]

On Mon, 2011-02-14 at 16:42 -0500, Bruce Ashfield wrote:
> Richard/Saul,
> 
> This fixed the error picked up overnight where the libc-headers
> fails because there is no dtb to install.
> 
> Note: this could have been fixed by factoring out the include
> of linux-dtb.inc into the individual recipes rather than by
> modifying the libc-headers rule to set the KERNEL_DEVICETREE
> to nothing. But the libc-headers is the exception and most 
> any other recipe that includes linux-yocto.inc needs this
> enabled, so I opted to leave the includes as they were.
> 
> Pull URL: git://git.pokylinux.org/poky-contrib.git
>   Branch: zedd/kernel
>   Browse: http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=zedd/kernel
> 
> Thanks,
>     Bruce Ashfield <bruce.ashfield@windriver.com>

Merged to master, thanks.

Richard