aboutsummaryrefslogtreecommitdiffstats
path: root/classes/kernel.bbclass
diff options
context:
space:
mode:
authorHolger Hans Peter Freyther <zecke@selfish.org>2008-11-15 18:23:17 +0100
committerHolger Hans Peter Freyther <zecke@selfish.org>2008-11-15 18:23:17 +0100
commita25da5c491ac2a3820be7aaa7fa507fe7ca8b354 (patch)
treed8162d4d8d6aaf5f129e203b6bc9d3ccead522f7 /classes/kernel.bbclass
parent9e167064390ce3bff7425be5c002ed3f1e7eb1d1 (diff)
parent828ced10e6eaf2048a8fd7ee7263807fab9d784d (diff)
downloadopenembedded-a25da5c491ac2a3820be7aaa7fa507fe7ca8b354.tar.gz
Merge commit 'origin/org.openembedded.dev' into holger/openmoko-merges
Diffstat (limited to 'classes/kernel.bbclass')
-rw-r--r--classes/kernel.bbclass7
1 files changed, 6 insertions, 1 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index 266a89dd9a..a6db6815ce 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -91,12 +91,17 @@ kernel_do_compile() {
}
kernel_do_compile[depends] = "${INITRAMFS_TASK}"
-
kernel_do_stage() {
ASMDIR=`readlink include/asm`
mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR
cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/
+ # Kernel 2.6.27 moved headers from includes/asm-${ARCH} to arch/${ARCH}/include/asm
+ if [ -e arch/${ARCH}/include/asm/ ] ; then
+ cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/
+ install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include
+ cp -fR arch/${ARCH}/include/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/include/
+ fi
rm -f $ASMDIR ${STAGING_KERNEL_DIR}/include/asm
ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm