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>

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index 5b02e62fdd69b21865572081930b74bfac2df7b8..64c8a94d64d8c60703c3f6b2e73cef1eaddb0135 100644 (file)
--- 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