diff options
| -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 5b02e62fd..64c8a94d6 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 |