mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-02-20 08:29:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

kernel.bbclass: tidy up staging of headers

Browse Source 
The changes merged from upstream used the ASMDIR variable even when it might
not have been set. These changes may be incorrect but at the very least I can
now build a QEMU image (including v86d) with the 2.6.33 kernel now.

Signed-off-by: Joshua Lock <josh@linux.intel.com>
This commit is contained in:
Joshua Lock
2010-05-20 16:09:39 +01:00
parent d887296baa
commit 5bec733fb1
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
meta/classes/kernel.bbclass
View File

@@ -120,7 +120,7 @@ kernel_do_install() {
# Kernel 2.6.27 moved headers from includes/asm-${ARCH} to arch/${ARCH}/include/asm
if [ -e arch/${ARCH}/include/asm/ ] ; then
if [ -e include/asm ] ; then
cp -fR arch/${ARCH}/include/asm/* $kerneldir/include/$ASMDIR/
cp -fR arch/${ARCH}/include/asm/* $kerneldir/include/asm/
fi
install -d $kerneldir/arch/${ARCH}/include
cp -fR arch/${ARCH}/* $kerneldir/arch/${ARCH}/
@@ -128,15 +128,18 @@ kernel_do_install() {
# Check for arch/x86 on i386
elif [ -d arch/x86/include/asm/ ]; then
if [ -e include/asm ] ; then
cp -fR arch/x86/include/asm/* $kerneldir/include/$ASMDIR/
cp -fR arch/x86/include/asm/* $kerneldir/include/asm/
fi
install -d $kerneldir/arch/x86/include
cp -fR arch/x86/* $kerneldir/arch/x86/
fi
# ASMDIR is not always set ...
if [ -e include/asm ] ; then
rm -f $kerneldir/include/asm
ln -sf $ASMDIR $kerneldir/include/asm
if [ -n $ASMDIR ] ; then
ln -sf $ASMDIR $kerneldir/include/asm
fi
fi
mkdir -p $kerneldir/include/asm-generic