kernel.bbclass,linux.inc: cleanup definition of ${KERNEL_IMAGE_BASE_NAME}

* drop ${DATETIME} from ${KERNEL_IMAGE_BASE_NAME} in kernel.bbclass, see:
  http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-March/005017.html
* make ${KERNEL_IMAGE_BASE_NAME} and ${KERNEL_IMAGE_SYMLINK_NAME} ?=, see:
  http://lists.linuxtogo.org/pipermail/openembedded-devel/2008-March/005016.html
* remove ${KERNEL_IMAGE_BASE_NAME} and ${KERNEL_IMAGE_SYMLINK_NAME} from linux.inc
* use ${KERNEL_IMAGE_BASE_NAME} for uImage deploy

diff --git a/classes/kernel.bbclass b/classes/kernel.bbclass
index a733c79..35b0374 100644 (file)
--- 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 ad7071c..f5049b1 100644 (file)
--- 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}"