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/conf | |
parent | e7fba8ed9cc84c1c1037e6d4b6daa11c4e6e9287 (diff) | |
download | poky-2151dc11992d663650837d515bef296f25cfe239.tar.gz |
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/conf')
-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 5ac6a50c73..aec61c7cfb 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" | |||
22 | 22 | ||
23 | PCMCIA_MANAGER ?= "pcmciautils" | 23 | PCMCIA_MANAGER ?= "pcmciautils" |
24 | 24 | ||
25 | MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen" | 25 | MACHINE_FEATURES = "kernel26 apm alsa pcmcia irda usbgadget keyboard touchscreen screen vfat" |
26 | MACHINE_FEATURES_append_tosa = " usbhost wifi " | 26 | MACHINE_FEATURES_append_tosa = " usbhost wifi " |
27 | MACHINE_FEATURES_append_akita = " usbhost " | 27 | MACHINE_FEATURES_append_akita = " usbhost " |
28 | MACHINE_FEATURES_append_spitz = " usbhost ext2 " | 28 | MACHINE_FEATURES_append_spitz = " usbhost ext2 " |
@@ -48,13 +48,13 @@ zaurus_make_installkit () { | |||
48 | mkdir ${IMAGE_NAME}-installkit/ | 48 | mkdir ${IMAGE_NAME}-installkit/ |
49 | 49 | ||
50 | # Get the latest kernel using the zImage-<machine>.bin symlink | 50 | # Get the latest kernel using the zImage-<machine>.bin symlink |
51 | cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage.bin | 51 | cp zImage-${MACHINE}.bin ${IMAGE_NAME}-installkit/zImage |
52 | 52 | ||
53 | if [ "${MACHINE}" = "spitz" ]; then | 53 | if [ "${MACHINE}" = "spitz" ]; then |
54 | cp gnu-tar ${IMAGE_NAME}-installkit/ | 54 | cp gnu-tar ${IMAGE_NAME}-installkit/ |
55 | cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz | 55 | cp ${IMAGE_NAME}.rootfs.tar.gz ${IMAGE_NAME}-installkit/hdimage1.tgz |
56 | else | 56 | else |
57 | cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin | 57 | [ -f ${IMAGE_NAME}.rootfs.jffs2 ] && cp ${IMAGE_NAME}.rootfs.jffs2 ${IMAGE_NAME}-installkit/initrd.bin |
58 | fi | 58 | fi |
59 | 59 | ||
60 | # All zaurus machines except collie need updater.sh | 60 | # All zaurus machines except collie need updater.sh |