kernel.bbclass: Use KERNEL_IMAGE_BASE_NAME variable instead of the expanded equivalen...

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/classes/kernel.bbclass b/meta/classes/kernel.bbclass
index b2f8132abff6a1181304fcdc4bb7f82ce92c453f..26273bd1e8cd761abc1e7d63ee0ac828c2295d21 100644 (file)
--- a/meta/classes/kernel.bbclass
+++ b/meta/classes/kernel.bbclass
@@ -484,16 +484,16 @@ kernel_do_deploy() {
 
        if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
                if test -e arch/${ARCH}/boot/uImage ; then
-                       cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+                       cp arch/${ARCH}/boot/uImage ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
                elif test -e arch/${ARCH}/boot/compressed/vmlinux ; then
                        ${OBJCOPY} -O binary -R .note -R .comment -S arch/${ARCH}/boot/compressed/vmlinux linux.bin
-                       uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+                       uboot-mkimage -A ${ARCH} -O linux -T kernel -C none -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
                        rm -f linux.bin
                else
                        ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
                        rm -f linux.bin.gz
                        gzip -9 linux.bin
-                       uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/uImage-${PV}-${PR}-${MACHINE}-${DATETIME}.bin
+                       uboot-mkimage -A ${ARCH} -O linux -T kernel -C gzip -a ${UBOOT_ENTRYPOINT} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOYDIR}/${KERNEL_IMAGE_BASE_NAME}.bin
                        rm -f linux.bin.gz
                fi
        fi