From afe0641baf060813e57e880c3a3f4b202a0dfefe Mon Sep 17 00:00:00 2001
From: Michael Smith <msmith@cbnco.com>
Date: Wed, 6 May 2009 03:38:35 +0000
Subject: kernel.bbclass: stage more include files for x86 in 2.6.27+

Some packages include <linux/types.h>, which requires <asm/types.h>.
Supplement b6220af33a70d96345dea130005ce842eeadfdf5 to copy files
from arch/x86/include/asm to include/asm-x86.

Signed-off-by: Michael Smith <msmith@cbnco.com>
Acked-by: Roman I Khimov <khimov@altell.ru>
---
 classes/kernel.bbclass | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'classes/kernel.bbclass')

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 3ee7f53a29..d084cefee8 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -103,8 +103,15 @@ kernel_do_stage() {
 		cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/
 		install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include
 		cp -fR arch/${ARCH}/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/	
+
+	# 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/
+		install -d ${STAGING_KERNEL_DIR}/arch/x86/include
+		cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/
 	fi
-	rm -f $ASMDIR ${STAGING_KERNEL_DIR}/include/asm
+
+	rm -f ${STAGING_KERNEL_DIR}/include/asm
 	ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm
 
 	mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic
-- 
cgit 1.2.3-korg