[oe-commits] Aleksey Makarov : kernel.bbclass: fix kernel build, version >= 2.6.33-rc1, arch x86

[git version control]

Module: openembedded.git
Branch: org.openembedded.dev
Commit: eaf451fc3ef576c3332edfa9ee64bc5cba8d3f72
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=eaf451fc3ef576c3332edfa9ee64bc5cba8d3f72

Author: Aleksey Makarov <amakarov at dev.rtsoft.ru>
Date:   Mon Jan 18 11:06:23 2010 +0000

kernel.bbclass: fix kernel build, version >= 2.6.33-rc1, arch x86

* Apply the same change as c0a3e91845fad1cdda723bdcf962de8bc01f8a2d for
  x86 path
* A check was missed in the x86 path of the stage method.

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 classes/kernel.bbclass |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 83530b5..53ea252 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -112,7 +112,9 @@ kernel_do_stage() {
 
 	# Check for arch/x86 on i386
 	elif [ -d arch/x86/include/asm/ ]; then
-		cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/
+		if [ -e include/asm ] ; then
+			cp -fR arch/x86/include/asm/* ${STAGING_KERNEL_DIR}/include/asm-x86/
+		fi
 		install -d ${STAGING_KERNEL_DIR}/arch/x86/include
 		cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/
 	fi