summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorMike Crowe <mac@mcrowe.com>2011-08-26 10:21:19 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-08-29 13:48:07 +0100
commit744f58fbfd669a7d551d1092d7c4463b01de8fc7 (patch)
tree7ad0e76bbf8d0c97f1e781f98ad822dc7f074ed6 /meta
parent7d8d3e678493e44b292711bde8462252aa2762dc (diff)
downloadpoky-744f58fbfd669a7d551d1092d7c4463b01de8fc7.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. (From OE-Core rev: de5b502330ded38c0efe2c4e30967ef12dbad72a) Signed-off-by: Mike Crowe <mac@mcrowe.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/classes/kernel.bbclass6
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 () {
471# with a fixed length or there is a limit in transferring the kernel to memory 471# with a fixed length or there is a limit in transferring the kernel to memory
472do_sizecheck() { 472do_sizecheck() {
473 if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then 473 if [ ! -z "${KERNEL_IMAGE_MAXSIZE}" ]; then
474 size=`ls -l arch/${ARCH}/boot/${KERNEL_IMAGETYPE} | awk '{ print $5}'` 474 size=`ls -l ${KERNEL_OUTPUT} | awk '{ print $5}'`
475 if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then 475 if [ $size -ge ${KERNEL_IMAGE_MAXSIZE} ]; then
476 rm arch/${ARCH}/boot/${KERNEL_IMAGETYPE} 476 rm ${KERNEL_OUTPUT}
477 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." 477 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."
478 fi 478 fi
479 fi 479 fi
@@ -487,7 +487,7 @@ KERNEL_IMAGE_BASE_NAME[vardepsexclude] = "DATETIME"
487KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}" 487KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
488 488
489kernel_do_deploy() { 489kernel_do_deploy() {
490 install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin 490 install -m 0644 ${KERNEL_OUTPUT} ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
491 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then 491 if (grep -q -i -e '^CONFIG_MODULES=y$' .config); then
492 tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib 492 tar -cvzf ${DEPLOYDIR}/modules-${KERNEL_VERSION}-${PR}-${MACHINE}.tgz -C ${D} lib
493 fi 493 fi