diff options
| author |   Mike Crowe <mac@mcrowe.com> | 2011-08-26 10:21:19 +0100 |
|---|---|---|
| committer |   Saul Wold <sgw@linux.intel.com> | 2011-08-26 12:34:12 -0700 |
| commit | de5b502330ded38c0efe2c4e30967ef12dbad72a (patch) | |
| tree | 9f441baba0c95733c6bd5eeb92114e853701fe01 /meta | |
| parent | ac92a573dd38270a28967c76472435cfd7f9bdfe (diff) | |
| download | openembedded-core-contrib-de5b502330ded38c0efe2c4e30967ef12dbad72a.tar.gz | |
kernel.bbclass: Find the kernel consistently.
Use KERNEL_OUTPUT variable to find the generated kernel image rather than
duplicating the existing path. This also means it can be overridden simply.
Signed-off-by: Mike Crowe <mac@mcrowe.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/kernel.bbclass | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass index 229679c72e..bc1baa0dd1 100644 --- a/meta/classes/kernel.bbclass +++ b/meta/classes/kernel.bbclass @@ -471,9 +471,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}" ]; 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 @@ -487,7 +487,7 @@ KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME" KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}" kernel_do_deploy() { - install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin + install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib fi |