]> git.openpandora.org Git - openembedded.git/commitdiff
linux kernels: use DEPLOY_DIR_IMAGE instead in DEPLOY_DIR/images
authorKoen Kooi <koen@openembedded.org>
Thu, 23 Feb 2006 11:44:25 +0000 (11:44 +0000)
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>
Thu, 23 Feb 2006 11:44:25 +0000 (11:44 +0000)
24 files changed:
packages/linux/LAB-kernel_2.6.13-hh2.bb
packages/linux/LAB-kernel_cvs.bb
packages/linux/collie-kernel-58-6-debug_2.4.18-rmk7-pxa3-embedix20030509.bb
packages/linux/devkitidp-pxa255-kernel_2.6.11.bb
packages/linux/ep93xx-kernel_2.6.15.bb
packages/linux/handhelds-pxa-2.6_2.6.15-hh0.bb
packages/linux/handhelds-pxa-2.6_cvs.bb
packages/linux/ixp4xx-kernel.inc
packages/linux/linux-jlime-sh3_2.6.11.bb
packages/linux/linux-mtx-1_2.4.27.bb
packages/linux/linux-omap-2.6_2.6.9-omap1.bb
packages/linux/linux-omap1_2.6.12-rc2.bb
packages/linux/linux-openzaurus.inc
packages/linux/linux-sun4cdm_2.4.26.bb
packages/linux/linux-wrt_2.4.20.bb
packages/linux/linux-wrt_2.4.30.bb
packages/linux/linux-xxs1500_2.4.21.bb
packages/linux/mainstone-kernel_2.6.11.bb
packages/linux/nslu2-kernel.inc
packages/linux/nslu2-linksys-kernel_2.4.22.bb
packages/linux/openzaurus-pxa27x_2.4.20-rmk2-embedix20050602.bb
packages/linux/openzaurus-pxa_2.4.18-rmk7-pxa3-embedix20031107.inc
packages/linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
packages/linux/triton-kernel_2.6.11.bb

index f50baf64addc250347ac6391daf99e178aa6fb34..eb5e97cc700ddda556f726b6d48fcf2e6c90a902 100644 (file)
@@ -28,8 +28,8 @@ do_configure() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/LAB-image-${MACHINE}
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/LAB-image-${MACHINE}
 }
 
 do_deploy[dirs] = "${S}"
index 25241cec1ecaa20fa0a73769bdfbb768940a4908..7b6aa5b23dc0e2baf20f49578b5c027ed730f86b 100644 (file)
@@ -35,8 +35,8 @@ do_configure() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/LAB-image-${MACHINE}
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/LAB-image-${MACHINE}
 #add the bootshim?
 }
 
index 5b594a959be39f4825e017163d5aa97335377967..8f42d6b38324984a905e00782ec3612e8e8eef05 100644 (file)
@@ -5,7 +5,7 @@ KERNEL_CONSOLE = "tty0"
 include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
+        install -d ${DEPLOY_DIR_IMAGE}
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} \
-       ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-DEBUG-${DATETIME}.bin
+       ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-DEBUG-${DATETIME}.bin
 }
index a0571bedb77a91df07e313a01e586617b12f8777..0b8b6ab63a5a741a6bad80c2c1839699b5379ac0 100644 (file)
@@ -31,8 +31,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+        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}"
index ba8ab0ec53ef328dc7cc700a87c110bc44035fd8..b29011f5f425d19071bb57b1b840cbc204053502 100644 (file)
@@ -18,8 +18,8 @@ do_configure() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
+        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}"
index f0fe6f32e929dc95d2ed169da347ebfa70aeeeac..7a5bebe43714dd61768cad312b12c55d317a7e0b 100644 (file)
@@ -27,8 +27,8 @@ do_configure() {
 }
 
 do_deploy() {
-       install -d ${DEPLOY_DIR}/images
-       install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
+       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}"
index 28b21328b220c66fd8623818a101a6a5c0aee3bf..915efa24392ab22a63ea5565475033a2d8122363 100644 (file)
@@ -32,8 +32,8 @@ do_configure() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}
+        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}"
index 2ddb7cbb6107ce249505eaa3800405af81f2d8e2..41ff745e71745bb8124a09fb71d1b4417cea2c61 100644 (file)
@@ -350,11 +350,11 @@ do_install_append() {
 do_deploy[dirs] = "${S}"
 
 deploy_image() {
-       copy_image '${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-'"$1" "$2"
+       copy_image '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-'"$1" "$2"
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
+        install -d ${DEPLOY_DIR_IMAGE}
        deploy_image '${IXP4XX_SUFFIX}'
 
        # And the machine specific images
index f77de8ab9ee1c11f6b5ce6018c373178198494da..b646c1a3b895b10f502d288b4de6c12a8435a848 100644 (file)
@@ -19,6 +19,6 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
+        install -d ${DEPLOY_DIR_IMAGE}
        install -m 0644 arch/$(ARCH)/boot/$(KERNEL_IMAGETYPE) $(DEPLOY_DIR)/images/$(KERNEL_IMAGETYPE)
 }
index 31015634ccda6ae452606304f44f74fb4ec399a2..cce3b3c30cafe13a81b7966646575b2850e81cbd 100644 (file)
@@ -70,10 +70,10 @@ fi
 FILES_kernel += " /tmp"
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-       install -m 0644 arch/mips/zboot/images/mtx-1.flash.bin ${DEPLOY_DIR}/images/${KERNEL_IMAGE_NAME}.flash.bin
-        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
+        install -d ${DEPLOY_DIR_IMAGE}
+       install -m 0644 arch/mips/zboot/images/mtx-1.flash.bin ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.bin
+        install -m 0644 arch/mips/zboot/images/mtx-1.flash.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.flash.srec
+       install -m 0644 arch/mips/zboot/images/mtx-1.srec ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGE_NAME}.ram.srec
 }
 
 do_deploy[dirs] = "${S}"
index adaf84f1ccd8d630af180789cba9fdae62dba0cb..5cb4a439b133e923faed7aa17428b4d073132272 100644 (file)
@@ -25,8 +25,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+        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}"
index e3dc2820177ff9adebbdde75f2b06e185cdb72a8..133fe9ac2c228147cc43e34a0d504e7724ab8325 100644 (file)
@@ -32,12 +32,12 @@ do_configure_prepend() {
 }
 
 do_deploy_omap5912osk() {
-        install -d ${DEPLOY_DIR}/images
+        install -d ${DEPLOY_DIR_IMAGE}
         arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR}/linux.bin
         gzip -f -9 ${DEPLOY_DIR}/linux.bin
         mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR}/linux.bin.gz ${DEPLOY_DIR}/uImage_bb.cc
         cp ${DEPLOY_DIR}/uImage_bb.cc /tftpboot
-#        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+#        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
 }
 
 
index 840396526928d76ac114d33f68bf0eeb30171129..c0b01616acd0bc52e0985869b4802c9397e47c52 100644 (file)
@@ -115,8 +115,8 @@ do_compile_append() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${PV}-${MACHINE}-${DATETIME}.bin
 }
 
 do_deploy[dirs] = "${S}"
index 50755231790264dbab980ceb86991fd1bb2dd78a..d91b9527877e1d59d815990556bea297c1fafe7d 100644 (file)
@@ -23,8 +23,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-       install -d ${DEPLOY_DIR}/images
-       elftoaout -o ${DEPLOY_DIR}/images/linux-aout-${DATETIME} ${KERNEL_IMAGETYPE}
+       install -d ${DEPLOY_DIR_IMAGE}
+       elftoaout -o ${DEPLOY_DIR_IMAGE}/linux-aout-${DATETIME} ${KERNEL_IMAGETYPE}
 }
 
 do_deploy[dirs] = "${S}"
index 9eb3218f6ecd57a7b0c0273c86d9b569fbfa4226..8e49ffa2c2d493bd71aa74f788f71271f267047e 100644 (file)
@@ -50,8 +50,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PACKAGE_ARCH}-${DATETIME}.bin
+        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}"
index efcd20df9b392e8f51a8e8fec5d5680b048ed582..0d9229c5d80a332dc85b86484f9d795932f66588 100644 (file)
@@ -103,9 +103,9 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-       install -d ${DEPLOY_DIR}/images
+       install -d ${DEPLOY_DIR_IMAGE}
        cat ${KERNEL_OUTPUT} | lzma e -si -so -eos > \
-               ${DEPLOY_DIR}/images/wrt-kernel-${PV}.lzma
+               ${DEPLOY_DIR_IMAGE}/wrt-kernel-${PV}.lzma
 }
 
 do_deploy[dirs] = "${S}"
index e4f7fac77651f38417584fd31e84a899764b81cb..4754b17046ef43eeacf5ba51fca03fc8ccf26475 100644 (file)
@@ -27,8 +27,8 @@ do_configure_prepend() {
 FILES_kernel += " /tmp"
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR}/images/${MACHINE}-${KV}-${KERNEL_IMAGETYPE}-${DATETIME}
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 ${KERNEL_OUTPUT} ${DEPLOY_DIR_IMAGE}/${MACHINE}-${KV}-${KERNEL_IMAGETYPE}-${DATETIME}
 }
 
 do_deploy[dirs] = "${S}"
index 2a4d168ac04a0c87fe79e1055f2441a6ba3e190e..12422c96deb6b3f70eadee2c8e8fbc9616ab7104 100644 (file)
@@ -28,8 +28,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+        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}"
index d30bcf77ce7b8a0de07ad6d163b31599e4c73ad2..b4c675264afd1a3e065d75c89f217d6fce13e04d 100644 (file)
@@ -251,8 +251,8 @@ do_install_append() {
 
 do_deploy[dirs] = "${S}"
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-       redboot_fixup '${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${N2K_SUFFIX}'
+        install -d ${DEPLOY_DIR_IMAGE}
+       redboot_fixup '${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${N2K_SUFFIX}'
 }
 
 addtask deploy before do_build after do_compile
index 0e2ea3e8044b69c2d029dc7291a636b8731edf08..40bceb373ecc7dd72167625dfe722d39cf7a0bbe 100644 (file)
@@ -42,8 +42,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
 }
 
 do_deploy[dirs] = "${S}"
index e5574dd35be590cce0db62f3c9d6d5c35699dddb..d9addd968abbdc7047ccf9192fb88577cd45d4a9 100644 (file)
@@ -91,8 +91,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${PACKAGE_ARCH}-${DATETIME}.bin
+        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}"
index d8c87d9f021880dd7413b89aaceb1225179fb2b3..4c8b43121d08a10dbf36cbd0b332fd14fb9489c9 100644 (file)
@@ -105,8 +105,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+        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}"
index 0c3ca93fa1ee6413dd427d5666405a869190bebe..f600acbaedbf94c97a148df0eb5170f96daaeee3 100644 (file)
@@ -91,9 +91,9 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
+        install -d ${DEPLOY_DIR_IMAGE} 
         install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} \
-       ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-${DATETIME}.bin
+       ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-${DATETIME}.bin
 }
 
 do_deploy[dirs] = "${S}"
index 5e95d969d12287d3efc16e1d73df6dcd7bd3b29c..6fc575c2b0308296277b4fce555b0e55e3785987 100644 (file)
@@ -29,8 +29,8 @@ do_configure_prepend() {
 }
 
 do_deploy() {
-        install -d ${DEPLOY_DIR}/images
-        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
+        install -d ${DEPLOY_DIR_IMAGE}
+        install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${KERNEL_SUFFIX}
 }
 
 do_deploy[dirs] = "${S}"