diff options
| author | Phil Blundell <philb@gnu.org> | 2010-02-28 20:47:24 +0000 |
|---|---|---|
| committer | Phil Blundell <philb@gnu.org> | 2010-02-28 20:47:24 +0000 |
| commit | dc352c9d9da30ec3d77aa58a7f535ce19871867d (patch) | |
| tree | 6a7d1986bb92191974b230a9d9c12adb9095ff45 /classes/kernel.bbclass | |
| parent | fd2bed3297f3b76a8a6b18ba599e7d9d71d2c045 (diff) | |
| parent | d58b4cdd9664e1926a4e14a575ba0bef4c2302ed (diff) | |
Merge branch 'org.openembedded.dev' of new.openembedded.org:openembedded into org.openembedded.dev
Diffstat (limited to 'classes/kernel.bbclass')
| -rw-r--r-- | classes/kernel.bbclass | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 39ff928e6a..3a52a067cc 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -127,16 +127,7 @@ kernel_do_stage() { mkdir -p ${STAGING_KERNEL_DIR}/include/asm-generic cp -fR include/asm-generic/* ${STAGING_KERNEL_DIR}/include/asm-generic/ - mkdir -p ${STAGING_KERNEL_DIR}/include/linux - cp -fR include/linux/* ${STAGING_KERNEL_DIR}/include/linux/ - - mkdir -p ${STAGING_KERNEL_DIR}/include/net - cp -fR include/net/* ${STAGING_KERNEL_DIR}/include/net/ - - mkdir -p ${STAGING_KERNEL_DIR}/include/pcmcia - cp -fR include/pcmcia/* ${STAGING_KERNEL_DIR}/include/pcmcia/ - - for entry in drivers/crypto drivers/media include/media include/acpi include/sound include/video include/scsi include/trace; do + for entry in drivers/crypto drivers/media include/generated include/linux include/net include/pcmcia include/media include/acpi include/sound include/video include/scsi include/trace; do if [ -d $entry ]; then mkdir -p ${STAGING_KERNEL_DIR}/$entry cp -fR $entry/* ${STAGING_KERNEL_DIR}/$entry/ @@ -497,7 +488,7 @@ python populate_packages_prepend () { # Support checking the kernel size since some kernels need to reside in partitions # with a fixed length or there is a limit in transferring the kernel to memory do_sizecheck() { - if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" -a -z "${DONT_CHECK_KERNELSIZE}" ]; then + if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'` if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then rm ${KERNEL_OUTPUT} |