From 0771406832d8d0951c50dd9a07aa05ef4bd05965 Mon Sep 17 00:00:00 2001
From: Jeremy Laine <jeremy.laine@m4x.org>
Date: Mon, 31 Mar 2008 08:32:59 +0000
Subject: [PATCH] =?utf8?q?kernel.bbclass,linux.inc:=20cleanup=20definition?=
 =?utf8?q?=20of=20${KERNEL=5FIMAGE=5FBASE=5FNAME}=20*=20drop=20${DATETIME}?=
 =?utf8?q?=20from=20${KERNEL=5FIMAGE=5FBASE=5FNAME}=20in=20kernel.bbclass,?=
 =?utf8?q?=20see:=20=20=20http://lists.linuxtogo.org/pipermail/openembedde?=
 =?utf8?q?d-devel/2008-March/005017.html=20*=20make=20${KERNEL=5FIMAGE=5FB?=
 =?utf8?q?ASE=5FNAME}=20and=20${KERNEL=5FIMAGE=5FSYMLINK=5FNAME}=20=3F=3D,?=
 =?utf8?q?=20see:=20=20=20http://lists.linuxtogo.org/pipermail/openembedde?=
 =?utf8?q?d-devel/2008-March/005016.html=20*=20remove=20${KERNEL=5FIMAGE?=
 =?utf8?q?=5FBASE=5FNAME}=20and=20${KERNEL=5FIMAGE=5FSYMLINK=5FNAME}=20fro?=
 =?utf8?q?m=20linux.inc=20*=20use=20${KERNEL=5FIMAGE=5FBASE=5FNAME}=C2=A0f?=
 =?utf8?q?or=20uImage=20deploy?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 classes/kernel.bbclass   | 12 ++++++------
 packages/linux/linux.inc |  2 --
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index a733c7963c..35b0374f77 100644
--- a/classes/kernel.bbclass
+++ b/classes/kernel.bbclass
@@ -463,8 +463,8 @@ do_sizecheck() {
 
 addtask sizecheck before do_install after do_compile
 
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}-${DATETIME}"
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
+KERNEL_IMAGE_BASE_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
+KERNEL_IMAGE_SYMLINK_NAME ?= "${KERNEL_IMAGETYPE}-${MACHINE}"
 
 do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
@@ -475,22 +475,22 @@ do_deploy() {
 	if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; then 
 		if 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 ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C none -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin ${DEPLOY_DIR_IMAGE}/${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 ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+			uboot-mkimage -A ${UBOOT_ARCH} -O linux -T kernel -C gzip -a ${UBOOT_LOADADDRESS} -e ${UBOOT_ENTRYPOINT} -n "${DISTRO_NAME}/${PV}/${MACHINE}" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 			rm -f linux.bin.gz
 		fi
-		package_stagefile_shell ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
+		package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
 	fi
 
 	cd ${DEPLOY_DIR_IMAGE}
 	rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
 	ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
-        package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.bin
+	package_stagefile_shell ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_SYMLINK_NAME}.bin
 }
 
 do_deploy[dirs] = "${S}"
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index ad7071c405..f5049b1d26 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -106,5 +106,3 @@ do_compile_append() {
     fi
 }
 
-KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
-KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
-- 
2.39.5