Patchwork [V2,1/2] kernel.bbclass: fix external module building

login
register
mail settings
Submitter Khem Raj
Date July 20, 2012, 11:22 p.m.
Message ID <1342826543-23508-1-git-send-email-raj.khem@gmail.com>
Download mbox | patch
Permalink /patch/32767/
State New
Headers show

Comments

Khem Raj - July 20, 2012, 11:22 p.m.
From: Denis Carikli <GNUtoo@no-log.org>

Without that fix we have the following while compiling compat-wireless.
  include/linux/mmzone.h:18:30: fatal error: generated/bounds.h: No such file or directory

Note that the compat-wireless recipe will be added in another commit.

make -C $kerneldir _mrproper_scripts deleted this file along with
other things so we resurrect it with this patch.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
---
 meta/classes/kernel.bbclass |    3 +++
 1 file changed, 3 insertions(+)
Darren Hart - July 27, 2012, 10:27 p.m.
On 07/20/2012 04:22 PM, Khem Raj wrote:
> From: Denis Carikli <GNUtoo@no-log.org>
> 
> Without that fix we have the following while compiling compat-wireless.
>   include/linux/mmzone.h:18:30: fatal error: generated/bounds.h: No such file or directory
> 
> Note that the compat-wireless recipe will be added in another commit.
> 
> make -C $kerneldir _mrproper_scripts deleted this file along with
> other things so we resurrect it with this patch.
> 
> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>

This addresses my concerns and incorporates Paul's request for
documentation in the commit header.

Acked-by: Darren Hart <dvhart@linux.intel.com>

> ---
>  meta/classes/kernel.bbclass |    3 +++
>  1 file changed, 3 insertions(+)
> 
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 08b5e61..ce4d7de 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -187,6 +187,9 @@ kernel_do_install() {
>  		cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
>  	fi
>  
> +	# Necessary for building modules like compat-wireless.
> +	cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
> +
>  	# Remove the following binaries which cause strip or arch QA errors
>  	# during do_package for cross-compiled platforms
>  	bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
>
Chris Larson - July 27, 2012, 11:23 p.m.
On Fri, Jul 20, 2012 at 4:22 PM, Khem Raj <raj.khem@gmail.com> wrote:
> From: Denis Carikli <GNUtoo@no-log.org>
>
> Without that fix we have the following while compiling compat-wireless.
>   include/linux/mmzone.h:18:30: fatal error: generated/bounds.h: No such file or directory
>
> Note that the compat-wireless recipe will be added in another commit.
>
> make -C $kerneldir _mrproper_scripts deleted this file along with
> other things so we resurrect it with this patch.
>
> Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org>
> Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
> ---
>  meta/classes/kernel.bbclass |    3 +++
>  1 file changed, 3 insertions(+)
>
> diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
> index 08b5e61..ce4d7de 100644
> --- a/meta/classes/kernel.bbclass
> +++ b/meta/classes/kernel.bbclass
> @@ -187,6 +187,9 @@ kernel_do_install() {
>                 cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
>         fi
>
> +       # Necessary for building modules like compat-wireless.
> +       cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
> +
>         # Remove the following binaries which cause strip or arch QA errors
>         # during do_package for cross-compiled platforms
>         bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
> --
> 1.7.9.5

As an fyi, this seems to have broken compatibility with 2.6 kernel
recipes, as bounds.h doesn't live in generated/ there.

Patch

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 08b5e61..ce4d7de 100644
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -187,6 +187,9 @@  kernel_do_install() {
 		cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
 	fi
 
+	# Necessary for building modules like compat-wireless.
+	cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
+
 	# Remove the following binaries which cause strip or arch QA errors
 	# during do_package for cross-compiled platforms
 	bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \