[oe-commits] org.oe.dev linux-omap1_2.6.12-rc2.bb : Fixes so it builds reliably

[crofton commit]

linux-omap1_2.6.12-rc2.bb : Fixes so it builds reliably
  * add dependency on u-boot
  * Fix do_deploy to massage kernel for use on omap5912osk board

Author: crofton at openembedded.org
Branch: org.openembedded.dev
Revision: 910e407ede2c21fb664e4341b86db29ea58c5a5e
ViewMTN: http://monotone.openembedded.org/revision.psp?id=910e407ede2c21fb664e4341b86db29ea58c5a5e
Files:
1
packages/linux/linux-omap1_2.6.12-rc2.bb
Diffs:

#
# mt diff -r6e5276443ce1272576e6e2f65a3e2b3ebe0230a1 -r910e407ede2c21fb664e4341b86db29ea58c5a5e
#
# 
# 
# patch "packages/linux/linux-omap1_2.6.12-rc2.bb"
#  from [0a52ae7c3903cc07473e787dc21e639615666662]
#    to [ca6b3e7790071f901d128cbb9ac631f66fc2de2a]
# 
============================================================
--- packages/linux/linux-omap1_2.6.12-rc2.bb	0a52ae7c3903cc07473e787dc21e639615666662
+++ packages/linux/linux-omap1_2.6.12-rc2.bb	ca6b3e7790071f901d128cbb9ac631f66fc2de2a
@@ -14,7 +14,7 @@ KERNEL_CCSUFFIX = "-3.3.4"
 KERNEL_OUTPUT = "arch/${ARCH}/boot/compressed/${KERNEL_IMAGETYPE}"
 KERNEL_CCSUFFIX = "-3.3.4"
 
-#DEPENDS = "uboot"
+DEPENDS = "u-boot"
 
 inherit kernel
 
@@ -25,13 +25,17 @@ do_configure_prepend() {
         oe_runmake oldconfig
 }
 
-do_deploy_omap5912osk() {
-        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_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+do_deploy() {
+        if [ "${MACHINE}" == "omap5912osk" ]; then
+                install -d ${DEPLOY_DIR_IMAGE}
+                arm-linux-objcopy -O binary -R .note -R .comment -S arch/arm/boot/compressed/vmlinux ${DEPLOY_DIR_IMAGE}/linux.bin
+                gzip -f -9 ${DEPLOY_DIR_IMAGE}/linux.bin
+                mkimage -A arm -O linux -T kernel -C gzip -a 0x10c08000 -e 0x10c08000 -n "OE" -d ${DEPLOY_DIR_IMAGE}/linux.bin.gz ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+                rm ${DEPLOY_DIR_IMAGE}/linux.bin.gz
+
+#               cp ${DEPLOY_DIR}/uImage_bb.cc /tftpboot
+#               install -m 0644 arch/${ARCH}/boot/${KERNEL_IMAGETYPE} ${DEPLOY_DIR_IMAGE}/${KERNEL_IMAGETYPE}-${MACHINE}-${DATETIME}.bin
+        fi
 }