simplify the collie kernel build

BKrev: 424eab2eLVAYbwMd3iM2R8K0IYCMAQ

8 files changed, 3 insertions, 44 deletions

diff --git a/packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb
index 2c01e7c7e3..6061c44db3 100644
--- a/packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-24-8_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,10 +1,4 @@
-SECTION = "kernel"
 COLLIE_MEMORY_SIZE=24
 COLLIE_RAMDISK_SIZE=8
 
 include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
-
-do_deploy_append() {
-	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
-	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
-}
diff --git a/packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb
index 1088b7a821..93e56d5a03 100644
--- a/packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-32-0_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,10 +1,4 @@
-SECTION = "kernel"
 COLLIE_MEMORY_SIZE=32
 COLLIE_RAMDISK_SIZE=0
 
 include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
-
-do_deploy_append() {
-	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
-	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
-}
diff --git a/packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb
index 4c6d3b13d8..66fe16e41c 100644
--- a/packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-32-32_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,10 +1,4 @@
-SECTION = "kernel"
 COLLIE_MEMORY_SIZE=32
 COLLIE_RAMDISK_SIZE=32
 
 include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
-
-do_deploy_append() {
-	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
-	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
-}
diff --git a/packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb
index bd067ecd07..fb4c892f05 100644
--- a/packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-40-24_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,10 +1,4 @@
-SECTION = "kernel"
 COLLIE_MEMORY_SIZE=40
 COLLIE_RAMDISK_SIZE=24
 
 include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
-
-do_deploy_append() {
-	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
-	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
-}
diff --git a/packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb
index f497cf6aa0..29cc546836 100644
--- a/packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-48-16_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,10 +1,4 @@
-SECTION = "kernel"
 COLLIE_MEMORY_SIZE=48
 COLLIE_RAMDISK_SIZE=16
 
 include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
-
-do_deploy_append() {
-	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
-	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
-}
diff --git a/packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb
index 5e3fbe19fe..ce13c7d2d6 100644
--- a/packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-58-6_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,10 +1,4 @@
-SECTION = "kernel"
 COLLIE_MEMORY_SIZE=58
 COLLIE_RAMDISK_SIZE=6
 
 include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
-
-do_deploy_append() {
-	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
-	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
-}
diff --git a/packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb b/packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb
index 646d0374f5..1aeafb8953 100644
--- a/packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb
+++ b/packages/linux/collie-kernel-64-0_2.4.18-rmk7-pxa3-embedix20030509.bb
@@ -1,10 +1,4 @@
-SECTION = "kernel"
 COLLIE_MEMORY_SIZE=64
 COLLIE_RAMDISK_SIZE=0
 
 include ../linux/openzaurus-sa_2.4.18-rmk7-pxa3-embedix20030509.bb
-
-do_deploy_append() {
-	! test -d ${DEPLOY_DIR}/images/collie/kernel && mkdir -p ${DEPLOY_DIR}/images/collie/kernel
-	mv ${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin ${DEPLOY_DIR}/images/collie/kernel/${KERNEL_IMAGETYPE}_collie-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}
-}
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 2eed2036c0..c5a70564e8 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
@@ -6,7 +6,7 @@ KV = "2.4.18"
 RMKV = "7"
 PXAV = "3"
 SHARPV = "20030509"
-PR = "r17"
+PR = "r18"
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/openzaurus-sa-${KV}-rmk${RMKV}-pxa${PXAV}-embedix${SHARPV}"
 
 SRC_URI = "http://aurach.ewu.edu/ield_software/ch5/ROM3.10_stuff/linux-sl5500-${SHARPV}-rom3_10.tar.bz2 \
@@ -88,7 +88,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 -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} \
+	${DEPLOY_DIR}/images/${KERNEL_IMAGETYPE}-${MACHINE}-${COLLIE_MEMORY_SIZE}-${COLLIE_RAMDISK_SIZE}-${DATETIME}.bin
 }
 
 do_deploy[dirs] = "${S}"