[oe-commits] org.oe.dev kernel.bbclass: use KERNEL_OUTPUT where possible

[Tom commit]

kernel.bbclass: use KERNEL_OUTPUT where possible

Author: Tom
Branch: org.openembedded.dev
Revision: 1b38165e32339d1af5c9bb0a0200860939e559b3
ViewMTN: http://monotone.openembedded.org/revision/info/1b38165e32339d1af5c9bb0a0200860939e559b3
Files:
1
classes/kernel.bbclass
Diffs:

#
# mt diff -r3d37ffd4df7a43763fa8642112a238989e1e85ae -r1b38165e32339d1af5c9bb0a0200860939e559b3
#
#
#
# patch "classes/kernel.bbclass"
#  from [3ffe1672ca1e9239f5d1d1b3d0b8264888a6808b]
#    to [aaee7c587861c7c66d492ee0c8e7540f99932496]
#
============================================================
--- classes/kernel.bbclass	3ffe1672ca1e9239f5d1d1b3d0b8264888a6808b
+++ classes/kernel.bbclass	aaee7c587861c7c66d492ee0c8e7540f99932496
@@ -52,7 +52,7 @@ KERNEL_LD = "${LD}${KERNEL_LDSUFFIX} ${H
 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 @@ do_sizecheck() {
 # 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 @@ do_deploy() {
 
 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