diff options
| author |   Martin Jansa <martin.jansa@gmail.com> | 2009-12-22 13:04:16 +0000 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2009-12-23 09:11:25 +0100 |
| commit | c0a3e91845fad1cdda723bdcf962de8bc01f8a2d (patch) | |
| tree | a9c51616882a2e00177e84cf777a6963c99096a3 /classes | |
| parent | c3bfaaa2b9b5e6b9595758a4d2ed05940bf20722 (diff) | |
| download | openembedded-c0a3e91845fad1cdda723bdcf962de8bc01f8a2d.tar.gz | |
kernel, linux-kernel-base classes: update for 2.6.33-rc1 and newer
* include/asm link was killed in
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=f7f16b7799ed68654850ab340ef812895aebcf4c
* utsrelease.h was moved in
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=273b281fa22c293963ee3e6eec418f5dda2dbc83
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Acked-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/kernel.bbclass | 19 | ||||
| -rw-r--r-- | classes/linux-kernel-base.bbclass | 3 |
2 files changed, 16 insertions, 6 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index edeaa660bb..069dcebf3d 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -95,13 +95,18 @@ kernel_do_compile() { kernel_do_compile[depends] = "${INITRAMFS_TASK}" kernel_do_stage() { - ASMDIR=`readlink include/asm` + if [ -e include/asm ] ; then + # This link is generated only in kernel before 2.6.33-rc1, don't stage it for newer kernels + ASMDIR=`readlink include/asm` - mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR - cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + mkdir -p ${STAGING_KERNEL_DIR}/include/$ASMDIR + cp -fR include/$ASMDIR/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + fi # 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/ + if [ -e include/asm ] ; then + cp -fR arch/${ARCH}/include/asm/* ${STAGING_KERNEL_DIR}/include/$ASMDIR/ + fi install -d ${STAGING_KERNEL_DIR}/arch/${ARCH}/include cp -fR arch/${ARCH}/* ${STAGING_KERNEL_DIR}/arch/${ARCH}/ @@ -112,8 +117,10 @@ kernel_do_stage() { cp -fR arch/x86/* ${STAGING_KERNEL_DIR}/arch/x86/ fi - rm -f ${STAGING_KERNEL_DIR}/include/asm - ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm + if [ -e include/asm ] ; then + rm -f ${STAGING_KERNEL_DIR}/include/asm + ln -sf $ASMDIR ${STAGING_KERNEL_DIR}/include/asm + fi mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic cp -fR include/asm-generic/* ${STAGING_KERNEL_DIR}/include/asm-generic/ diff --git a/classes/linux-kernel-base.bbclass b/classes/linux-kernel-base.bbclass index b3e0fdad7a..510951a620 100644 --- a/classes/linux-kernel-base.bbclass +++ b/classes/linux-kernel-base.bbclass @@ -4,6 +4,9 @@ def get_kernelversion(p): fn = p + '/include/linux/utsrelease.h' if not os.path.isfile(fn): + # after 2.6.33-rc1 + fn = p + '/include/generated/utsrelease.h' + if not os.path.isfile(fn): fn = p + '/include/linux/version.h' import re |