Skip to contentSkip to conversation

kernel.bbclass: Iff exists, copy bounds.h for external module building.

PATCH In review Leon Woestenberg 3 participants 5 messages Jul 28, 2012 – Aug 1, 2012

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kernel.bbclass: Iff exists, copy bounds.h for external module building.

From: Leon Woestenberg <[email protected]>

---
 meta/classes/kernel.bbclass |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)
meta/classes/kernel.bbclass +6 -0
index c21ab96..bd3e335 100644
@@ -183,6 +183,12 @@ kernel_do_install() {
 		cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
 	fi
 
+	# make -C $kerneldir _mrproper_scripts deleted this file, but we need it for
+	# building external modules like compat-wireless.
+	if [ -f include/generated/bounds.h ]; then
+		cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
+	fi
+
 	# Remove the following binaries which cause strip errors
 	# during do_package for cross-compiled platforms
 	bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
Signature · 1 line
1.7.0.4
#1 lore raw
Quoted 12 lines · Leon Woestenberg

From: Leon Woestenberg<[email protected]>

---
  meta/classes/kernel.bbclass |    6 ++++++
  1 files changed, 6 insertions(+), 0 deletions(-)
meta/classes/kernel.bbclass +0 -0
index c21ab96..bd3e335 100644

meta/classes/kernel.bbclass kernel_do_install() { · line 190

Quoted 8 lines
meta/classes/kernel.bbclass +5 -0
@@ -183,6 +183,12 @@ kernel_do_install() {
  		cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o
  	fi
 
+	# make -C $kerneldir _mrproper_scripts deleted this file, but we need it for
+	# building external modules like compat-wireless.
+	if [ -f include/generated/bounds.h ]; then
+		cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
+	fi

This change is definitely safer using and older kernel that doesn't have a generated bounds.h .. but your tree is out of date. This should be on top of:

commit 9247550642a536f83c6c711ce4bd340e5e5606b7

Author: Denis Carikli <[email protected]>
Date:   Fri Jul 20 16:22:22 2012 -0700

kernel.bbclass: fix external module building

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.

(From OE-Core rev: 2d114fd0cdf7486f18e53f2bf41c4f559e4b4a8d)

Cheers,

Bruce

Quoted 4 lines
meta/classes/kernel.bbclass +1 -0
+
  	# Remove the following binaries which cause strip errors
  	# during do_package for cross-compiled platforms
  	bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \
#2 lore raw
Quoted 3 lines · Bruce Ashfield
Quoted 2 lines · Leon Woestenberg

From: Leon Woestenberg<[email protected]>

Aha. And now I see that Scott G was copied. If this was for 1.2.x of yocto, that needs to be clearly in the subject .. otherwise it is just confusing.

My comment still stands that if this is needed for denzil, it should be the same fixes we have in master, and not something different.

Cheers,

Bruce

Quoted 60 lines
Quoted 13 lines

---
meta/classes/kernel.bbclass | 6 ++++++

1 files changed, 6 insertions(+), 0 deletions(-)
meta/classes/kernel.bbclass +0 -0
index c21ab96..bd3e335 100644
@@ -183,6 +183,12 @@ kernel_do_install() {

cp arch/powerpc/lib/crtsavres.o $kerneldir/arch/powerpc/lib/crtsavres.o fi

Quoted 6 lines

+ # make -C $kerneldir _mrproper_scripts deleted this file, but we need it for
+ # building external modules like compat-wireless.
+ if [ -f include/generated/bounds.h ]; then
+ cp include/generated/bounds.h $kerneldir/include/generated/bounds.h
+ fi

This change is definitely safer using and older kernel that doesn't have a generated bounds.h .. but your tree is out of date. This should be on top of:

commit 9247550642a536f83c6c711ce4bd340e5e5606b7
Author: Denis Carikli <[email protected]>
Date: Fri Jul 20 16:22:22 2012 -0700

kernel.bbclass: fix external module building

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.

(From OE-Core rev: 2d114fd0cdf7486f18e53f2bf41c4f559e4b4a8d)

Cheers,

Bruce

Quoted 4 lines

+
# Remove the following binaries which cause strip errors

# during do_package for cross-compiled platforms
bin_files="arch/powerpc/boot/addnote arch/powerpc/boot/hack-coff \

_______________________________________________
yocto mailing list
[email protected]
https://lists.yoctoproject.org/listinfo/yocto

#3 lore raw

Hello Bruce, Scott,

Quoted 12 lines · Bruce Ashfield
Quoted 5 lines · Bruce Ashfield
Quoted 3 lines · Leon Woestenberg

From: Leon Woestenberg<leon@sidebranch.**com <[email protected]>>

Aha. And now I see that Scott G was copied. If this was for 1.2.x of yocto, that needs to be clearly in the subject .. otherwise it is just confusing.

Correct, my intention was for Denzil. Agreed, the full fix should be first proposed for HEAD, and I should first fix my GIT script foo setup. This went wrong in several ways.

Regards,

Leon.

#4 lore raw
Quoted 13 lines · Leon Woestenberg
Quoted 12 lines · Bruce Ashfield
Quoted 6 lines · Leon Woestenberg
Quoted 4 lines

From: Leon Woestenberg<[email protected]>

Aha. And now I see that Scott G was copied. If this was for 1.2.x of yocto,
that needs to be clearly in the subject .. otherwise it is just confusing.

Quoted 7 lines

On Mon, Jul 30, 2012 at 5:09 PM, Bruce Ashfield < [email protected]> wrote:
Correct, my intention was for Denzil. Agreed, the full fix should be first proposed for HEAD, and I should first fix my GIT script foo setup. This went wrong in several ways.

Fixed in separate attempt. This thread is closed.

Thanks,

Leon.