[oe-commits] org.oe.dev Zaurus machine config: fix code for creation of installkit for collie

[Laibsch commit]

Zaurus machine config: fix code for creation of installkit for collie
* remove the code from collie config.  It is present in collie-2.6.inc
* collie needs zImage, not zImage.bin.  Other Zaurus devices can handle
  zImage or zImage.bin, so zImage it is for all of them.

Author: Laibsch at openembedded.org
Branch: org.openembedded.dev
Revision: 503b3ade200ad628a4b30fab228c365b8c0cf2ea
ViewMTN: http://monotone.openembedded.org/revision/info/503b3ade200ad628a4b30fab228c365b8c0cf2ea
Files:
1
conf/machine/include/collie-2.6.inc
conf/machine/include/zaurus-2.6.inc
Diffs:

#
# mt diff -r6dbb0f5220c722dbdae7ef9a4362860548c71380 -r503b3ade200ad628a4b30fab228c365b8c0cf2ea
#
# 
# 
# patch "conf/machine/include/collie-2.6.inc"
#  from [a71f2479ea4e652346eccf4594034af29bb74651]
#    to [cc7c687162b52882f755a8824e1a07762b725aca]
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [7ecb352669b5b71228489192cdeb5826dc02b46a]
#    to [7d4d7255328d5d3f3d61e09ec7b527085533b4d6]
# 
============================================================
--- conf/machine/include/collie-2.6.inc	a71f2479ea4e652346eccf4594034af29bb74651
+++ conf/machine/include/collie-2.6.inc	cc7c687162b52882f755a8824e1a07762b725aca
@@ -6,28 +6,3 @@ MACHINE_POSTPROCESS_COMMAND = "zaurus_ma
 MACHINE_EXTRA_RDEPENDS = "kernel-modules"
 
 MACHINE_POSTPROCESS_COMMAND = "zaurus_make_installkit"
-
-zaurus_make_installkit () {
-    cd ${DEPLOY_DIR_IMAGE}
-    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
-    mkdir ${IMAGE_NAME}-installkit/
-    # Get the latest kernel using the zImage-<machine>.bin symlink
-    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
-    if [ "${MACHINE}" = "spitz" ]; then
-        cp gnu-tar ${IMAGE_NAME}-installkit/
-        cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz
-    else
-        [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin
-    fi
-
-    # All zaurus machines except collie need updater.sh
-    if [ "${MACHINE}" != "collie" ]; then
-        cp updater.sh.${MACHINE} ${IMAGE_NAME}-installkit/updater.sh
-    fi
-
-    tar czf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz ${IMAGE_NAME}-installkit/
-    md5sum ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz > ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit.tgz.md5
-    rm -rf ${DEPLOY_DIR_IMAGE}/${IMAGE_NAME}-installkit/
-}
-
-
============================================================
--- conf/machine/include/zaurus-2.6.inc	7ecb352669b5b71228489192cdeb5826dc02b46a
+++ conf/machine/include/zaurus-2.6.inc	7d4d7255328d5d3f3d61e09ec7b527085533b4d6
@@ -49,7 +49,7 @@ zaurus_make_installkit () {
     mkdir ${IMAGE_NAME}-installkit/
 
     # Get the latest kernel using the zImage-<machine>.bin symlink
-    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage
 
     if [ "${MACHINE}" = "spitz" ]; then
         cp gnu-tar ${IMAGE_NAME}-installkit/