diff options
| author |   Joshua Lock <josh@linux.intel.com> | 2010-05-20 16:09:39 +0100 |
|---|---|---|
| committer | Joshua Lock <josh@linux.intel.com> | 2010-05-20 16:09:39 +0100 |
| commit | 5bec733fb1542f300e039e60ffb97e346e97ed35 (patch) | |
| tree | fcac0fb856a97d245f4f40a4ca7c7d6c2cd7dfb2 /meta/classes/kernel.bbclass | |
| parent | d887296baa34054e5841b48d5344ccbfc4979611 (diff) | |
| download | openembedded-core-contrib-5bec733fb1542f300e039e60ffb97e346e97ed35.tar.gz | |
kernel.bbclass: tidy up staging of headers
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>
Diffstat (limited to 'meta/classes/kernel.bbclass')
| -rw-r--r-- | meta/classes/kernel.bbclass | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 5b02e62fdd..64c8a94d64 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -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 |