diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2008-08-04 11:02:46 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2008-08-04 11:02:46 +0000 |
| commit | 9d8c327318a4f6b00e712fa0776694fb73c62577 (patch) | |
| tree | 2913602d90e9506acb321e9214e77e98b450bd7d /classes | |
| parent | 2b30dffed71d78a8d26a31539c85beb38ef5f75a (diff) | |
| parent | d371e2c69b107d2949d640df221405306e6a40f5 (diff) | |
merge of '5fce36059a59f5f0270baf7f4ddbb9cb496ea312'
and 'b68ae87d8ee0969bc8a91ea0ac326fb34c5eb9a4'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/kernel.bbclass | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass index 837b7c3ad6..50fbbfb663 100644 --- a/classes/kernel.bbclass +++ b/classes/kernel.bbclass @@ -52,7 +52,7 @@ KERNEL_CC = "${CCACHE}${HOST_PREFIX}gcc${KERNEL_CCSUFFIX} ${HOST_CC_KERNEL_ARCH} KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${HOST_LD_KERNEL_ARCH}" # Where built kernel lies in the kernel tree -KERNEL_OUTPUT = "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}" +KERNEL_OUTPUT ?= "arch/${ARCH}/boot/${KERNEL_IMAGETYPE}" KERNEL_IMAGEDEST = "boot" # @@ -451,9 +451,9 @@ python populate_packages_prepend () { # 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 - size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` + size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'` if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then - rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} + rm ${KERNEL_OUTPUT} die "This kernel (size=$size > ${KERNEL_IMAGE_MAXSIZE}) is too big for your device. Please reduce the size of the kernel by making more of it modular." fi fi @@ -466,7 +466,7 @@ KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}" do_deploy() { install -d ${DEPLOY_DIR_IMAGE} - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin + install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin if [ -d "${D}/lib" ]; then |