diff options
| author | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-01-18 12:22:41 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openedhand.com> | 2008-01-18 12:22:41 +0000 |
| commit | 2151dc11992d663650837d515bef296f25cfe239 (patch) | |
| tree | cfdddc8865844b268f91be0288ce26a55cec87a9 /meta | |
| parent | e7fba8ed9cc84c1c1037e6d4b6daa11c4e6e9287 (diff) | |
| download | openembedded-core-2151dc11992d663650837d515bef296f25cfe239.tar.gz openembedded-core-2151dc11992d663650837d515bef296f25cfe239.tar.bz2 openembedded-core-2151dc11992d663650837d515bef296f25cfe239.tar.xz openembedded-core-2151dc11992d663650837d515bef296f25cfe239.zip | |
zaurus-2.6: merge OE changes (part2: installkit changes)
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@3519 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/conf/machine/include/zaurus-2.6.inc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/machine/include/zaurus-2.6.inc b/meta/conf/machine/include/zaurus-2.6.inc index 5ac6a50c7..aec61c7cf 100644 --- a/meta/conf/machine/include/zaurus-2.6.inc +++ b/meta/conf/machine/include/zaurus-2.6.inc @@ -22,7 +22,7 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive" PCMCIA_MANAGER ?= "pcmciautils" -MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen" +MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" MACHINE_FEATURES_append_tosa = " usbhost wifi " MACHINE_FEATURES_append_akita = " usbhost " MACHINE_FEATURES_append_spitz = " usbhost ext2 " @@ -48,13 +48,13 @@ 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/ cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz else - cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin + [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin fi # All zaurus machines except collie need updater.sh |