merge of '08741953caff388c0875d0ab93ac3409dee8f1a2'

     and 'e8194e4192e392d230ab779c662314391f3e6ef0'

65 files changed, 25 insertions, 566 deletions

diff --git a/packages/linux/LAB-kernel_2.6.13-hh2.bb b/packages/linux/LAB-kernel_2.6.13-hh2.bb
index 9ee0539ac3..f03a7db402 100644
--- a/packages/linux/LAB-kernel_2.6.13-hh2.bb
+++ b/packages/linux/LAB-kernel_2.6.13-hh2.bb
@@ -26,12 +26,5 @@ do_configure() {
         yes '' | oe_runmake oldconfig
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/LAB-image-${MACHINE}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
+KERNEL_IMAGE_BASE__NAME = "LAB-image-${MACHINE}-${DATETIME}.bin"
+KERNEL_IMAGE_SYMLINK_NAME = "LAB-image-${MACHINE}"
diff --git a/packages/linux/LAB-kernel_cvs.bb b/packages/linux/LAB-kernel_cvs.bb
index c7b72ab7f2..0daa4742f3 100644
--- a/packages/linux/LAB-kernel_cvs.bb
+++ b/packages/linux/LAB-kernel_cvs.bb
@@ -51,19 +51,13 @@ do_configure() {
         yes '' | oe_runmake oldconfig
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/LAB-image-${MACHINE}
+KERNEL_IMAGE_BASE_NAME = "LAB-image-${MACHINE}-${DATETIME}.bin"
+KERNEL_IMAGE_SYMLINK_NAME =  "LAB-image-${MACHINE}^"
 
+do_deploy_append() {
 	# Generate the HTC flavor, which must be a multiple of 512 bytes long.
 	cat ${WORKDIR}/greatwall_header arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${WORKDIR}/greatwall_trailer | dd conv=sync of=${DEPLOY_DIR_IMAGE}/LAB-image-${MACHINE}.htc
 }
 
 do_stage() {
 }
-
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
diff --git a/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb
index 5160d18f95..47b331b34d 100644
--- a/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -4,8 +4,5 @@ KERNEL_CONSOLE = "tty0"
 
 require ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} \
-	${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-DEBUG-${DATETIME}.bin
-}
+KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-DEBUG-${DATETIME}.bin"
+KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-DEBUG.bin"
diff --git a/packages/linux/compulab-pxa270_2.6.16.bb b/packages/linux/compulab-pxa270_2.6.16.bb
index bd3135510f..fe72df8213 100644
--- a/packages/linux/compulab-pxa270_2.6.16.bb
+++ b/packages/linux/compulab-pxa270_2.6.16.bb
@@ -31,12 +31,6 @@ do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/2.6.16/CL_FlashDrv ${S}/drivers/block/cl_flash
 }
 
-do_deploy() {
-	KNAME=${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${KNAME}
-}
-
 python do_compulab_image() {
 	import os
 	import os.path
@@ -62,11 +56,7 @@ python do_compulab_image() {
 	fo.close()
 }
 
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_install after do_compile
-addtask compulab_image before do_install after do_deploy
+addtask compulab_image before do_build after do_deploy
 
 COMPATIBLE_MACHINE = "cm-x270"
 
diff --git a/packages/linux/devkitidp-pxa255_2.6.19.bb b/packages/linux/devkitidp-pxa255_2.6.19.bb
index 500c0535d2..f9eb6a7777 100644
--- a/packages/linux/devkitidp-pxa255_2.6.19.bb
+++ b/packages/linux/devkitidp-pxa255_2.6.19.bb
@@ -28,12 +28,3 @@ do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
 #	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
index 8cfd541720..79d90bc4c7 100644
--- a/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
+++ b/packages/linux/ep93xx-kernel_2.6.17+2.6.18-rc1.bb
@@ -43,14 +43,3 @@ do_configure() {
 
 
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
-
diff --git a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
index df8912e57e..642b13f607 100644
--- a/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
+++ b/packages/linux/ep93xx-kernel_2.6.19+2.6.20-rc7.bb
@@ -42,15 +42,3 @@ do_configure() {
 
 
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_package after do_install
-
-
-
diff --git a/packages/linux/gumstix-linux.inc b/packages/linux/gumstix-linux.inc
index 038089c965..76fd15d95a 100644
--- a/packages/linux/gumstix-linux.inc
+++ b/packages/linux/gumstix-linux.inc
@@ -9,10 +9,7 @@ DEPENDS += " \
            u-boot-mkimage-openmoko-native \
           "
 
-KERNEL_IMAGE_BASE_NAME = ${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}
-
 S = "${WORKDIR}/linux-${PV}"
-do_deploy[dirs] = "${S}"
 
 do_configure_prepend() {
         echo "" > ${S}/.config
@@ -44,18 +41,3 @@ do_install_prepend() {
              ln -f arch/${ARCH}/boot/images/uImage arch/${ARCH}/boot/uImage
         fi
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib
-        
-        if test "x${KERNEL_IMAGETYPE}" = "xuImage" ; 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 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
-            rm -f linux.bin
-
-        fi
-}
-
-addtask deploy before do_package after do_install
diff --git a/packages/linux/ixp4xx-kernel.inc b/packages/linux/ixp4xx-kernel.inc
index af5f78b918..8ec06e2682 100644
--- a/packages/linux/ixp4xx-kernel.inc
+++ b/packages/linux/ixp4xx-kernel.inc
@@ -353,8 +353,6 @@ do_install_append() {
 	install_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3'
 }
 
-do_deploy[dirs] = "${S}"
-
 deploy_image() {
 	copy_image '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-'"$1" "$2"
 }
@@ -369,5 +367,3 @@ do_deploy() {
 	deploy_image 'dsmg600${SITEINFO_ENDIANESS}' 'dsmg600'
 	deploy_image 'fsg3${SITEINFO_ENDIANESS}' 'fsg3'
 }
-
-addtask deploy before do_package after do_install
diff --git a/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb b/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
index 6c5e1cb16c..db72fe7d31 100644
--- a/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
+++ b/packages/linux/linux-amsdelta-2.6_2.6.16-omap2.bb
@@ -32,12 +32,3 @@ do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
         oe_runmake oldconfig
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-bd-neon-2.6_2.6.22.bb b/packages/linux/linux-bd-neon-2.6_2.6.22.bb
index 46fa4295b6..05ceb28ee5 100644
--- a/packages/linux/linux-bd-neon-2.6_2.6.22.bb
+++ b/packages/linux/linux-bd-neon-2.6_2.6.22.bb
@@ -32,17 +32,10 @@ do_configure() {
         yes '' | oe_runmake oldconfig
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${PR}-${MACHINE}.tgz -C ${D} lib
+do_deploy_append() {
         ${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
         rm -f linux.bin.gz
         gzip -9 linux.bin
         ${STAGING_BINDIR_NATIVE}/mkimage -A arm -O linux -T kernel -C gzip -a a0008000 -e a0008000 -n "Boundary Devices NEON" -d linux.bin.gz ${DEPLOY_DIR_IMAGE}/uImage-${PV}-${PR}-${MACHINE}.bin
         rm -f linux.bin.gz
 }
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_package after do_install
diff --git a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
index a66aae3700..1907b09f75 100644
--- a/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
+++ b/packages/linux/linux-efika_2.6.18+2.6.19-rc6.bb
@@ -24,14 +24,3 @@ do_configure() {
 		install -m 644 ${WORKDIR}/defconfig ${S}/.config
 		yes | make ARCH=${ARCH} oldconfig
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
-
diff --git a/packages/linux/linux-efika_2.6.20.20.bb b/packages/linux/linux-efika_2.6.20.20.bb
index 8ef0af6c78..2f707a17e3 100644
--- a/packages/linux/linux-efika_2.6.20.20.bb
+++ b/packages/linux/linux-efika_2.6.20.20.bb
@@ -70,14 +70,3 @@ do_stage_append () {
        cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
        cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
-
diff --git a/packages/linux/linux-efika_2.6.20.bb b/packages/linux/linux-efika_2.6.20.bb
index 87c769a1ae..839d206cd1 100644
--- a/packages/linux/linux-efika_2.6.20.bb
+++ b/packages/linux/linux-efika_2.6.20.bb
@@ -67,16 +67,3 @@ do_stage_append () {
        cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
        cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
-
-
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
-
diff --git a/packages/linux/linux-efika_2.6.21+git.bb b/packages/linux/linux-efika_2.6.21+git.bb
index 5f8427ef1e..20b5bf86b6 100644
--- a/packages/linux/linux-efika_2.6.21+git.bb
+++ b/packages/linux/linux-efika_2.6.21+git.bb
@@ -54,14 +54,3 @@ do_stage_append () {
        cp -pPR include/asm-powerpc ${STAGING_KERNEL_DIR}/include/
        cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
-
diff --git a/packages/linux/linux-gumstix_2.6.15.bb b/packages/linux/linux-gumstix_2.6.15.bb
index 3e0302fe5f..1812148f6e 100644
--- a/packages/linux/linux-gumstix_2.6.15.bb
+++ b/packages/linux/linux-gumstix_2.6.15.bb
@@ -72,17 +72,13 @@ do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig-gumstix ${S}/.config
 }
 
-do_deploy() {
+do_deploy_append() {
         ${HOST_PREFIX}objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux arch/arm/boot/compressed/linux.bin
         mkimage -A arm -O linux -T kernel -C none -a 0xa0008000 -e 0xa0008000 -n "gumstix" -d arch/arm/boot/compressed/linux.bin arch/arm/boot/uImage
 		install -d ${DEPLOY_DIR_IMAGE}
 		cp arch/arm/boot/uImage ${DEPLOY_DIR_IMAGE}/uImage-${PN}-${PV}
 }
 
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
 PACKAGES += "kernel-modules-sound kernel-modules-bluetooth kernel-modules-pcmcia kernel-modules-ide kernel-modules-ethernet kernel-modules-wireless kernel-modules-usb kernel-modules-mmc kernel-modules-fat kernel-modules-nfs"
 
 ALLOW_EMPTY_kernel-modules-sound = "1"
diff --git a/packages/linux/linux-hackndev-2.6_git.bb b/packages/linux/linux-hackndev-2.6_git.bb
index 7fdf94f3ac..387a1da89c 100644
--- a/packages/linux/linux-hackndev-2.6_git.bb
+++ b/packages/linux/linux-hackndev-2.6_git.bb
@@ -73,13 +73,3 @@ do_compile_prepend() {
                 cd -
 	fi
 }
-
-do_deploy() {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}   
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
diff --git a/packages/linux/linux-handhelds-2.6.inc b/packages/linux/linux-handhelds-2.6.inc
index 48e49115f0..658757a73c 100644
--- a/packages/linux/linux-handhelds-2.6.inc
+++ b/packages/linux/linux-handhelds-2.6.inc
@@ -23,8 +23,6 @@ HHV     ?= "${@bb.data.getVar('PV',d,1).split('-')[1].split('hh')[-1]}"
 
 KERNEL_PRIORITY = "${@'%d' % (int(bb.data.getVar('K_MAJOR',d,1)) * 100000000 + int(bb.data.getVar('K_MINOR',d,1)) * 1000000 + int(bb.data.getVar('K_MICRO',d,1)) * 10000 + float(bb.data.getVar('HHV',d,1)))}"
 
-KERNEL_FILENAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}.bin"
-
 do_configure() {
 
 	if [ `grep EXTRAVERSION Makefile | grep hh | awk '{print $3}' | sed s/-hh//` != ${HHV} ]; then
@@ -65,15 +63,11 @@ do_configure() {
 
 }
 
-do_deploy() {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_FILENAME}
-	tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib
-	
+do_deploy_append() {
 	#reflash.ctl is required to reflash using bootldr
 	# format:
 	# name file md5sumfile destination
-	echo "${MACHINE}-kernel-${DATETIME} ${KERNEL_FILENAME} - kernel" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl
+	echo "${MACHINE}-kernel-${DATETIME} ${KERNEL_IMAGE_BASE_NAME} - kernel" >> ${DEPLOY_DIR_IMAGE}/reflash.ctl
 	gen_haret_startup
 
 	if [ -n "${KERNEL_INITRAMFS_PATH}" -a "${ANGSTROM_MODE}" == "glibc" ]; then
@@ -81,17 +75,13 @@ do_deploy() {
 	fi
 }   
    
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_package after do_install
-
 
 gen_haret_startup() {
 	cat >${DEPLOY_DIR_IMAGE}/startup.txt <<EOF 
 # This is startup file for HaRET, Linux bootloader for WinCE
 # http://handhelds.org/wiki/HaRET
 
-set kernel "${KERNEL_FILENAME}"
+set kernel "${KERNEL_IMAGE_BASE_NAME}"
 
 # Boot choices. Uncomment 'set' statements in exactly one section
 
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.11.bb b/packages/linux/linux-jlime-jornada6xx_2.6.11.bb
index 4b6f1fab9b..654b02788c 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.11.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.11.bb
@@ -20,8 +20,3 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig_jlime ${S}/.config
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/$(ARCH)/boot/$(KERNEL_IMAGETYPE) $(DEPLOY_DIR)/images/$(KERNEL_IMAGETYPE)
-}
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
index afe5f30f29..86a5f6083f 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.17.bb
@@ -27,8 +27,3 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig_jlime ${S}/.config
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/$(ARCH)/boot/$(KERNEL_IMAGETYPE) $(DEPLOY_DIR)/images/$(KERNEL_IMAGETYPE)
-}
diff --git a/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
index 4b8a85844e..c7ebe829c4 100644
--- a/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
+++ b/packages/linux/linux-jlime-jornada6xx_2.6.21rc5.bb
@@ -25,8 +25,3 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/$(ARCH)/boot/$(KERNEL_IMAGETYPE) $(DEPLOY_DIR)/images/$(KERNEL_IMAGETYPE)
-}
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
index c9b39e5f8e..0d95972010 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.17.bb
@@ -35,8 +35,3 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconf_jlime ${S}/.config
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/$(ARCH)/boot/$(KERNEL_IMAGETYPE) $(DEPLOY_DIR)/images/$(KERNEL_IMAGETYPE)
-}
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
index dbb4277723..789dddf9b8 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.18.bb
@@ -23,8 +23,3 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconf_jlime ${S}/.config
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/$(ARCH)/boot/$(KERNEL_IMAGETYPE) $(DEPLOY_DIR)/images/$(KERNEL_IMAGETYPE)
-}
diff --git a/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
index 52861e82ab..f756d4f259 100644
--- a/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
+++ b/packages/linux/linux-jlime-jornada7xx_2.6.19rc6.bb
@@ -25,8 +25,3 @@ FILES_kernel-image = "/boot/${KERNEL_IMAGETYPE}*"
 do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconf_jlime ${S}/.config
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/$(ARCH)/boot/$(KERNEL_IMAGETYPE) $(DEPLOY_DIR)/images/$(KERNEL_IMAGETYPE)
-}
diff --git a/packages/linux/linux-ks8695_2.6.16.bb b/packages/linux/linux-ks8695_2.6.16.bb
index de64c680a8..a357443fdb 100644
--- a/packages/linux/linux-ks8695_2.6.16.bb
+++ b/packages/linux/linux-ks8695_2.6.16.bb
@@ -23,12 +23,3 @@ do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config
 	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-linkstationarm_2.6.12.bb b/packages/linux/linux-linkstationarm_2.6.12.bb
index 704309162c..df984a02c3 100644
--- a/packages/linux/linux-linkstationarm_2.6.12.bb
+++ b/packages/linux/linux-linkstationarm_2.6.12.bb
@@ -24,13 +24,4 @@ do_configure() {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
 	ARCH=${ARCH} oe_runmake oldconfig
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/vmlinux.UBoot
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
+KERNEL_IMAGE_SYMLINK_NAME="vmlinux.UBoot"
diff --git a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
index 6bcc0d9a06..f04e1f591c 100644
--- a/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
+++ b/packages/linux/linux-linkstationppc_2.6.21-rc5.bb
@@ -31,12 +31,4 @@ do_install_append() {
 	dtc -f -I dts -O dtb -o ${D}/boot/kuroboxHG.dtb -V 16 arch/${ARCH}/boot/dts/kuroboxHG.dts
 	dtc -f -I dts -O dtb -o ${D}/boot/kuroboxHD.dtb -V 16 arch/${ARCH}/boot/dts/kuroboxHD.dts
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/vmlinux.UBoot
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
+KERNEL_IMAGE_SYMLINK_NAME="vmlinux.UBoot"
diff --git a/packages/linux/linux-ml403-mvista-2.6.x_git.bb b/packages/linux/linux-ml403-mvista-2.6.x_git.bb
index 77b0bbc326..59bcff431e 100644
--- a/packages/linux/linux-ml403-mvista-2.6.x_git.bb
+++ b/packages/linux/linux-ml403-mvista-2.6.x_git.bb
@@ -55,8 +55,3 @@ do_install_prepend() {
         install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \
                         arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
 }
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
diff --git a/packages/linux/linux-ml403-slab-2.6.x_git.bb b/packages/linux/linux-ml403-slab-2.6.x_git.bb
index f0408f365c..ad823c2aa6 100644
--- a/packages/linux/linux-ml403-slab-2.6.x_git.bb
+++ b/packages/linux/linux-ml403-slab-2.6.x_git.bb
@@ -78,8 +78,3 @@ do_install_prepend() {
         install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE}.elf \
                         arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
 }
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
diff --git a/packages/linux/linux-mtx-1_2.4.27.bb b/packages/linux/linux-mtx-1_2.4.27.bb
index 512f3ac14d..5815a570ee 100644
--- a/packages/linux/linux-mtx-1_2.4.27.bb
+++ b/packages/linux/linux-mtx-1_2.4.27.bb
@@ -79,7 +79,3 @@ do_deploy() {
         install -m 0644 arch/mips/zboot/images/mtx-1.flash.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.srec
 	install -m 0644 arch/mips/zboot/images/mtx-1.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.ram.srec
 }
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-mtx-2_2.4.27.bb b/packages/linux/linux-mtx-2_2.4.27.bb
index 29c938a5c4..66ce06c6ca 100644
--- a/packages/linux/linux-mtx-2_2.4.27.bb
+++ b/packages/linux/linux-mtx-2_2.4.27.bb
@@ -91,7 +91,3 @@ do_deploy() {
         install -m 0644 arch/mips/zboot/images/mtx-2.flash.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.srec
 	install -m 0644 arch/mips/zboot/images/mtx-2.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.ram.srec
 }
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-mtx-3_2.6.15.4.bb b/packages/linux/linux-mtx-3_2.6.15.4.bb
index 1bddcfdd3b..e3b23b1968 100644
--- a/packages/linux/linux-mtx-3_2.6.15.4.bb
+++ b/packages/linux/linux-mtx-3_2.6.15.4.bb
@@ -89,7 +89,3 @@ do_deploy() {
         #install -m 0644 arch/mips/boot/mtx-3.flash.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.srec
 	#install -m 0644 arch/mips/boot/mtx-3.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.ram.srec
 }
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-mtx-3_2.6.15.bb b/packages/linux/linux-mtx-3_2.6.15.bb
index 3dba1fe6a0..e1613d6f60 100644
--- a/packages/linux/linux-mtx-3_2.6.15.bb
+++ b/packages/linux/linux-mtx-3_2.6.15.bb
@@ -57,7 +57,3 @@ do_deploy() {
         install -m 0644 arch/arm/zboot/images/mtx-3.flash.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.srec
 	install -m 0644 arch/arm/zboot/images/mtx-3.srec ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.ram.srec
 }
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-navman_2.6.18.bb b/packages/linux/linux-navman_2.6.18.bb
index f9b8e37817..b37b68e8c9 100644
--- a/packages/linux/linux-navman_2.6.18.bb
+++ b/packages/linux/linux-navman_2.6.18.bb
@@ -40,14 +40,3 @@ do_configure() {
 
         yes '' | oe_runmake oldconfig
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
-
diff --git a/packages/linux/linux-nokia800.inc b/packages/linux/linux-nokia800.inc
index d3301aacbd..07b9766efc 100644
--- a/packages/linux/linux-nokia800.inc
+++ b/packages/linux/linux-nokia800.inc
@@ -31,12 +31,3 @@ do_configure_prepend() {
         yes '' | oe_runmake oldconfig
 
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-omap-2.6_2.6.9-omap1.bb b/packages/linux/linux-omap-2.6_2.6.9-omap1.bb
index 1a6d1f894a..cdcdcdf825 100644
--- a/packages/linux/linux-omap-2.6_2.6.9-omap1.bb
+++ b/packages/linux/linux-omap-2.6_2.6.9-omap1.bb
@@ -18,12 +18,3 @@ do_configure_prepend() {
 	install -m 0644 ${WORKDIR}/defconfig ${S}/.config
         oe_runmake oldconfig
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-palm-omap1_2.6.22-omap1.bb b/packages/linux/linux-palm-omap1_2.6.22-omap1.bb
index fdfe740770..786e4901c3 100644
--- a/packages/linux/linux-palm-omap1_2.6.22-omap1.bb
+++ b/packages/linux/linux-palm-omap1_2.6.22-omap1.bb
@@ -35,12 +35,3 @@ do_configure() {
 	yes '' | oe_runmake oldconfig
 
 }
-
-do_deploy() {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}   
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-rp-2.6.24/defconfig-collie b/packages/linux/linux-rp-2.6.24/defconfig-collie
index e1b80f94ab..a29a12de45 100644
--- a/packages/linux/linux-rp-2.6.24/defconfig-collie
+++ b/packages/linux/linux-rp-2.6.24/defconfig-collie
@@ -53,7 +53,8 @@ CONFIG_FAIR_USER_SCHED=y
 # CONFIG_FAIR_CGROUP_SCHED is not set
 # CONFIG_SYSFS_DEPRECATED is not set
 # CONFIG_RELAY is not set
-# CONFIG_BLK_DEV_INITRD is not set
+CONFIG_BLK_DEV_INITRD=y
+CONFIG_INITRAMFS_SOURCE=""
 CONFIG_CC_OPTIMIZE_FOR_SIZE=y
 CONFIG_SYSCTL=y
 CONFIG_EMBEDDED=y
diff --git a/packages/linux/linux-rp.inc b/packages/linux/linux-rp.inc
index e823839afd..a8980ab06e 100644
--- a/packages/linux/linux-rp.inc
+++ b/packages/linux/linux-rp.inc
@@ -4,6 +4,8 @@ LICENSE = "GPL"
 
 inherit kernel
 
+
+INITRAMFS_IMAGE=initramfs-kexec-image
 DEPENDS_append_collie = " bc-native"
 RPROVIDES_kernel-base += "hostap-modules"
 
@@ -17,9 +19,6 @@ TKSRC = "http://www.informatik.hu-berlin.de/~tkunze/zaurus/patches"
 COMPATIBLE_HOST = "(arm|i.86).*-linux"
 COMPATIBLE_MACHINE = '(collie|poodle|c7x0|akita|spitz|tosa|hx2000|qemuarm|qemux86|bootcdx86|htcuniversal)'
 
-KERNEL_CUSTOM_NAME ?= ""
-KERNEL_DEPLOY_NAME ?= "${KERNEL_IMAGETYPE}-${PV}-${KERNEL_CUSTOM_NAME}${MACHINE}-${DATETIME}.bin"
-KERNEL_SYMLINK_NAME ?=  "${KERNEL_IMAGETYPE}-${KERNEL_CUSTOM_NAME}${MACHINE}.bin"
 KERNEL_DEFCONFIG ?= "defconfig-${MACHINE}"
 
 CMDLINE_CON = "console=ttyS0,115200n8 console=tty1 noinitrd"
@@ -142,18 +141,6 @@ do_configure() {
 	yes '' | oe_runmake oldconfig
 }
 
-do_deploy() {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_DEPLOY_NAME}
-	cd ${DEPLOY_DIR_IMAGE}
-	ln -sf ${KERNEL_DEPLOY_NAME} ${KERNEL_SYMLINK_NAME}
-	tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib	
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_package after do_install
-
 # wlan-ng stuff need compiled kernel sources
 do_rm_work() {
 }
diff --git a/packages/linux/linux-rp_2.6.24.bb b/packages/linux/linux-rp_2.6.24.bb
index 48f964d7e7..2b13fc47f1 100644
--- a/packages/linux/linux-rp_2.6.24.bb
+++ b/packages/linux/linux-rp_2.6.24.bb
@@ -56,7 +56,6 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
            file://pxa-serial-hack.patch;patch=1;status=hack \
            file://connectplus-remove-ide-HACK.patch;patch=1;status=hack \
            file://connectplus-prevent-oops-HACK.patch;patch=1;status=hack \
-           file://htcuni.patch;patch=1 \
            file://binutils-buildid-arm.patch;patch=1 \
            file://versatile-armv6.patch;patch=1 \
            file://defconfig-c7x0 \
@@ -75,6 +74,7 @@ SRC_URI = "${KERNELORG_MIRROR}pub/linux/kernel/v2.6/linux-2.6.24.tar.bz2 \
 # FIXMEs before made default	   
 # ${RPSRC}/mmcsd_no_scr_check-r1.patch;patch=1;status=hack
 
+# file://htcuni.patch;patch=1 \
 
 # Add this to enable pm debug code (useful with a serial lead)
 #  ${RPSRC}/sharpsl_pm_debug-r0.patch;patch=1
diff --git a/packages/linux/linux-sequoia_2.6.21.bb b/packages/linux/linux-sequoia_2.6.21.bb
index 49c7878ca2..006fd3a51d 100644
--- a/packages/linux/linux-sequoia_2.6.21.bb
+++ b/packages/linux/linux-sequoia_2.6.21.bb
@@ -39,22 +39,9 @@ do_stage_append () {
        cp -pPR include/asm-ppc ${STAGING_KERNEL_DIR}/include/
 }
 
-
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE} \
-                 ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
 #seems like 2.6.21 kernel images have moved (or is this only for the Denx kernel ?)
 #so we need to copy the kernel image where kernel.bbclass expects it to be
 do_install_prepend() {
         install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE} \
                         arch/${ARCH}/boot/${KERNEL_IMAGETYPE}
 }
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
diff --git a/packages/linux/linux-smdk2440_2.6.20+git.bb b/packages/linux/linux-smdk2440_2.6.20+git.bb
index cb824e22bb..b86d970e50 100644
--- a/packages/linux/linux-smdk2440_2.6.20+git.bb
+++ b/packages/linux/linux-smdk2440_2.6.20+git.bb
@@ -22,16 +22,4 @@ do_configure() {
 	oe_runmake oldconfig
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
-        rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
-        ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_package after do_install
-
 KERNEL_RELEASE = "2.6.21"
diff --git a/packages/linux/linux-smdk2443_2.6.20+git.bb b/packages/linux/linux-smdk2443_2.6.20+git.bb
index b91ddb7bd0..034137e89c 100644
--- a/packages/linux/linux-smdk2443_2.6.20+git.bb
+++ b/packages/linux/linux-smdk2443_2.6.20+git.bb
@@ -31,12 +31,7 @@ do_configure() {
 	oe_runmake oldconfig
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
-        rm -f ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
-        ln -s ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_RELEASE}-${MACHINE}.tgz -C ${D} lib
+do_deploy_append() {
 	${OBJCOPY} -O binary -R .note -R .comment -S vmlinux linux.bin
         rm -f linux.bin.gz
         gzip -9 linux.bin
@@ -44,8 +39,4 @@ do_deploy() {
         rm -f linux.bin.gz
 }
 
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_package after do_install
-
 KERNEL_RELEASE = "2.6.21-rc5"
diff --git a/packages/linux/linux-storcenter_2.6.12.6.bb b/packages/linux/linux-storcenter_2.6.12.6.bb
index efbef7e937..b0e8c4d61c 100644
--- a/packages/linux/linux-storcenter_2.6.12.6.bb
+++ b/packages/linux/linux-storcenter_2.6.12.6.bb
@@ -44,18 +44,7 @@ do_configure() {
 		make ARCH=ppc oldconfig
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
 #ppc build leaves the kernel in a different place
 #do_movekernel() {
 #
 #}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
-
diff --git a/packages/linux/linux-storcenter_2.6.15.7.bb b/packages/linux/linux-storcenter_2.6.15.7.bb
index 4895b2174e..74dfd8fb3a 100644
--- a/packages/linux/linux-storcenter_2.6.15.7.bb
+++ b/packages/linux/linux-storcenter_2.6.15.7.bb
@@ -23,14 +23,3 @@ do_configure() {
 	install -m 644 ${WORKDIR}/defconfig-${PV} ${S}/.config
 	make ARCH=${ARCH} oldconfig
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
-
diff --git a/packages/linux/linux-sun4cdm_2.4.26.bb b/packages/linux/linux-sun4cdm_2.4.26.bb
index 7145c4451c..52b3ecb26c 100644
--- a/packages/linux/linux-sun4cdm_2.4.26.bb
+++ b/packages/linux/linux-sun4cdm_2.4.26.bb
@@ -26,7 +26,3 @@ do_deploy() {
 	install -d ${DEPLOY_DIR_IMAGE}
 	elftoaout -o ${DEPLOY_DIR_IMAGE}/linux-aout-${DATETIME} ${KERNEL_IMAGETYPE}
 }
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux-tornado-omap2_2.6.16.16.bb b/packages/linux/linux-tornado-omap2_2.6.16.16.bb
index ccbb4cd867..a9ebee14cd 100644
--- a/packages/linux/linux-tornado-omap2_2.6.16.16.bb
+++ b/packages/linux/linux-tornado-omap2_2.6.16.16.bb
@@ -39,12 +39,3 @@ do_configure() {
         yes '' | oe_runmake oldconfig
 
 }
-
-do_deploy() {
-	install -d ${DEPLOY_DIR_IMAGE}
-	install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}   
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_populate_staging after do_compile
diff --git a/packages/linux/linux-turbostation_2.6.20.2.bb b/packages/linux/linux-turbostation_2.6.20.2.bb
index 91080752fc..308c5e7a46 100644
--- a/packages/linux/linux-turbostation_2.6.20.2.bb
+++ b/packages/linux/linux-turbostation_2.6.20.2.bb
@@ -34,18 +34,7 @@ do_configure() {
 		make ARCH=ppc oldconfig
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/images/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
 #ppc build leaves the kernel in a different place
 #do_movekernel() {
 #
 #}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
-
diff --git a/packages/linux/linux-wrt_2.4.20.bb b/packages/linux/linux-wrt_2.4.20.bb
index d36016caa9..23a5d4f203 100644
--- a/packages/linux/linux-wrt_2.4.20.bb
+++ b/packages/linux/linux-wrt_2.4.20.bb
@@ -47,13 +47,4 @@ do_configure_prepend() {
 	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PACKAGE_ARCH}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
 COMPATIBLE_MACHINE = "wrt54"
diff --git a/packages/linux/linux-wrt_2.4.30.bb b/packages/linux/linux-wrt_2.4.30.bb
index ec269d94ef..951e7c34f0 100644
--- a/packages/linux/linux-wrt_2.4.30.bb
+++ b/packages/linux/linux-wrt_2.4.30.bb
@@ -107,8 +107,4 @@ do_deploy() {
 		${DEPLOY_DIR_IMAGE}/wrt-kernel-${PV}.lzma
 }
 
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
 COMPATIBLE_MACHINE = "wrt54"
diff --git a/packages/linux/linux-x86_2.6.20.bb b/packages/linux/linux-x86_2.6.20.bb
index cc2c9e1c1e..3872c50cba 100644
--- a/packages/linux/linux-x86_2.6.20.bb
+++ b/packages/linux/linux-x86_2.6.20.bb
@@ -28,13 +28,3 @@ do_configure_prepend_i586-generic() {
 do_configure_prepend_i686() {
 	install -m 0644 ${WORKDIR}/i686-defconfig ${S}/.config
 }
-
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/i386/boot/${KERNEL_IMAGETYPE}  ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME} 
-}   
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_populate_staging after do_compile
diff --git a/packages/linux/linux-xxs1500_2.4.21.bb b/packages/linux/linux-xxs1500_2.4.21.bb
index 2775208680..b4fab93669 100644
--- a/packages/linux/linux-xxs1500_2.4.21.bb
+++ b/packages/linux/linux-xxs1500_2.4.21.bb
@@ -27,12 +27,3 @@ do_configure_prepend() {
 }
 
 FILES_kernel += " /tmp"
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${MACHINE}-${KV}-${KERNEL_IMAGETYPE}-${DATETIME}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/linux.inc b/packages/linux/linux.inc
index e0303c272f..66636ba50e 100644
--- a/packages/linux/linux.inc
+++ b/packages/linux/linux.inc
@@ -131,18 +131,3 @@ do_compile_append() {
 
 KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${PV}-${PR}-${MACHINE}"
 KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}"
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_BASE_NAME}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${PV}-${PR}-${MACHINE}.tgz -C ${D} lib
-
-        cd ${DEPLOY_DIR_IMAGE}
-        rm -f ${KERNEL_IMAGE_SYMLINK_NAME}.bin
-        ln -sf ${KERNEL_IMAGE_BASE_NAME}.bin ${KERNEL_IMAGE_SYMLINK_NAME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_package after do_install
-
diff --git a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
index f631ff5356..e7ab462c0b 100644
--- a/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
+++ b/packages/linux/logicpd-pxa270_2.6.17-rc5.bb
@@ -26,13 +26,4 @@ do_configure_prepend() {
 
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
 COMPATIBLE_MACHINE = "logicpd-pxa270"
diff --git a/packages/linux/logicpd-pxa270_2.6.19.2.bb b/packages/linux/logicpd-pxa270_2.6.19.2.bb
index f4b40e6cc6..7a4eaae99b 100644
--- a/packages/linux/logicpd-pxa270_2.6.19.2.bb
+++ b/packages/linux/logicpd-pxa270_2.6.19.2.bb
@@ -47,13 +47,4 @@ do_configure_prepend() {
 
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
 COMPATIBLE_MACHINE = "logicpd-pxa270"
diff --git a/packages/linux/mainstone-kernel_2.6.11.bb b/packages/linux/mainstone-kernel_2.6.11.bb
index d3c5cd1ea3..cae3bf799c 100644
--- a/packages/linux/mainstone-kernel_2.6.11.bb
+++ b/packages/linux/mainstone-kernel_2.6.11.bb
@@ -25,13 +25,4 @@ do_configure_prepend() {
 #	echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
 COMPATIBLE_MACHINE = "mainstone"
diff --git a/packages/linux/mx21ads-kernel_2.6.19rc6.bb b/packages/linux/mx21ads-kernel_2.6.19rc6.bb
index fe9c695b67..47f363d7df 100644
--- a/packages/linux/mx21ads-kernel_2.6.19rc6.bb
+++ b/packages/linux/mx21ads-kernel_2.6.19rc6.bb
@@ -44,14 +44,3 @@ do_configure_prepend() {
 	yes '' | oe_runmake oldconfig
 
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
-
diff --git a/packages/linux/mx31ads-kernel_2.6.19rc6.bb b/packages/linux/mx31ads-kernel_2.6.19rc6.bb
index 3854a82eb8..90463936d8 100644
--- a/packages/linux/mx31ads-kernel_2.6.19rc6.bb
+++ b/packages/linux/mx31ads-kernel_2.6.19rc6.bb
@@ -45,13 +45,4 @@ do_configure_prepend() {
 
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
 KERNEL_RELEASE = "2.6.19-rc6"
diff --git a/packages/linux/netbook-pro-kernel_2.6.17.bb b/packages/linux/netbook-pro-kernel_2.6.17.bb
index 6360ef56ae..1d24646b3b 100644
--- a/packages/linux/netbook-pro-kernel_2.6.17.bb
+++ b/packages/linux/netbook-pro-kernel_2.6.17.bb
@@ -43,14 +43,3 @@ do_configure() {
 
 
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
-
diff --git a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
index edeb927f0d..5a90d415fb 100644
--- a/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
+++ b/packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
@@ -91,12 +91,3 @@ do_configure_prepend() {
         install -m 0644 ${WORKDIR}/defconfig-${MACHINE} ${S}/.config || die "No default configuration for ${MACHINE} available."
         echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PACKAGE_ARCH}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
diff --git a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
index cfedac8425..b56746880f 100644
--- a/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
+++ b/packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
@@ -105,15 +105,6 @@ do_configure_prepend() {
         echo "CONFIG_CMDLINE=\"${CMDLINE}\"" >> ${S}/.config
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
 PACKAGE_ARCH_corgi    = "c7x0"
 PACKAGE_ARCH_shepherd = "c7x0"
 PACKAGE_ARCH_husky    = "c7x0"
diff --git a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
index d4c93b7b6c..b21a0c9328 100644
--- a/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -92,13 +92,5 @@ do_configure_prepend() {
         echo "CONFIG_CMDLINE=\"$CMDLINE mem=${mem}M\"" >> ${S}/.config
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} \
-	${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-${DATETIME}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
+KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-${DATETIME}.bin"
+KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}.bin"
diff --git a/packages/linux/triton-kernel_2.6.11.bb b/packages/linux/triton-kernel_2.6.11.bb
index 343dd83bb3..c580706b25 100644
--- a/packages/linux/triton-kernel_2.6.11.bb
+++ b/packages/linux/triton-kernel_2.6.11.bb
@@ -3,8 +3,6 @@ DESCRIPTION = "Linux kernel for the KARO TRITON XScale Board"
 LICENSE = "GPL"
 PR = "r0"
 
-KERNEL_SUFFIX = "triton"
-
 SRC_URI = "${KERNELORG_MIRROR}/pub/linux/kernel/v2.6/linux-${PV}.tar.bz2 \
            ${KERNELORG_MIRROR}/pub/linux/kernel/people/akpm/patches/2.6/${PV}/${PV}-mm2/${PV}-mm2.bz2;patch=1 \
 		   file://patch-2.6.11-mm2-karo9.bz2;patch=1 \
@@ -26,13 +24,4 @@ do_configure_prepend() {
 	       ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch
 }
 
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
-
 COMPATIBLE_MACHINE = "triton"
diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
index a666d224a9..da3f9772d3 100644
--- a/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
+++ b/packages/linux/unslung-kernel_2.4.22.l2.3r63.bb
@@ -49,12 +49,5 @@ do_configure_prepend() {
 	rm -rf ${S}/include/asm-arm/arch ${S}/include/asm-arm/proc \
 	       ${S}/include/asm-arm/.proc ${S}/include/asm-arm/.arch
 }
-
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}.bin
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_build after do_compile
+KERNEL_IMAGE_BASE_NAME = "${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}-${DATETIME}.bin"
+KERNEL_IMAGE_SYMLINK_NAME = "${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}.bin"
diff --git a/packages/linux/xanadux-un-2.6_2.6.12.bb b/packages/linux/xanadux-un-2.6_2.6.12.bb
index 4a0f5265f1..176a2e952f 100644
--- a/packages/linux/xanadux-un-2.6_2.6.12.bb
+++ b/packages/linux/xanadux-un-2.6_2.6.12.bb
@@ -17,17 +17,3 @@ do_configure() {
         cp arch/arm/configs/htcuniversal_defconfig .config || die "No default configuration for ${MACHINE} available."
         yes '' | oe_runmake oldconfig
 }
-
-
-###############################################################
-# put into deploy directory
-#
-do_deploy() {
-        install -d ${DEPLOY_DIR_IMAGE}
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
-        tar -cvzf ${DEPLOY_DIR_IMAGE}/modules-${KERNEL_VERSION}-${MACHINE}.tgz -C ${D} lib
-}
-
-do_deploy[dirs] = "${S}"
-
-addtask deploy before do_package after do_install