diff options
| author | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-01-10 17:47:51 +0000 |
|---|---|---|
| committer | Rolf Leggewie <oe-devel@rolf.leggewie.biz> | 2008-01-10 17:47:51 +0000 |
| commit | e83cd15cbbe73ab0dd97f3e07056d6e0fc03be59 (patch) | |
| tree | 0a9ddabb6af98648c6f0daadff9f7dfbda616d1d /conf | |
| parent | 298950d2c89817b08909e5b5135b5510ab988a36 (diff) | |
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.
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/machine/include/collie-2.6.inc | 25 | ||||
| -rw-r--r-- | conf/machine/include/zaurus-2.6.inc | 2 |
2 files changed, 1 insertions, 26 deletions
diff --git a/conf/machine/include/collie-2.6.inc b/conf/machine/include/collie-2.6.inc index bc80185fa0..ec2de70326 100644 --- a/conf/machine/include/collie-2.6.inc +++ b/conf/machine/include/collie-2.6.inc @@ -6,28 +6,3 @@ MACHINE_FEATURES = "kernel26 apm pcmcia screen irda usbgadget keyboard touchscre 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/ -} - - diff --git a/conf/machine/include/zaurus-2.6.inc b/conf/machine/include/zaurus-2.6.inc index 3f84138ac8..eb020dbcba 100644 --- a/conf/machine/include/zaurus-2.6.inc +++ b/conf/machine/include/zaurus-2.6.inc @@ -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/ |