[oe-commits] org.oe.dev disapproval of revision '503b3ade200ad628a4b30fab228c365b8c0cf2ea'

[koen commit]

disapproval of revision '503b3ade200ad628a4b30fab228c365b8c0cf2ea'

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

#
# mt diff -r503b3ade200ad628a4b30fab228c365b8c0cf2ea -re52ff8ea262ab9963525b0a0f6ac0f631d53e597
#
# 
# 
# patch "conf/machine/include/collie-2.6.inc"
#  from [cc7c687162b52882f755a8824e1a07762b725aca]
#    to [a71f2479ea4e652346eccf4594034af29bb74651]
# 
# patch "conf/machine/include/zaurus-2.6.inc"
#  from [7d4d7255328d5d3f3d61e09ec7b527085533b4d6]
#    to [7ecb352669b5b71228489192cdeb5826dc02b46a]
# 
============================================================
--- conf/machine/include/collie-2.6.inc	cc7c687162b52882f755a8824e1a07762b725aca
+++ conf/machine/include/collie-2.6.inc	a71f2479ea4e652346eccf4594034af29bb74651
@@ -6,3 +6,28 @@ 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	7d4d7255328d5d3f3d61e09ec7b527085533b4d6
+++ conf/machine/include/zaurus-2.6.inc	7ecb352669b5b71228489192cdeb5826dc02b46a
@@ -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
+    cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin
 
     if [ "${MACHINE}" = "spitz" ]; then
         cp gnu-tar ${IMAGE_NAME}-installkit/