summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/include/qemu.inc
diff options
context:
space:
mode:
authorJoshua Lock <josh@linux.intel.com>2008-11-06 00:33:24 +0000
committerJoshua Lock <josh@linux.intel.com>2008-11-06 00:33:24 +0000
commitfa7a4cd807bf819c11d79ac0b22d8dc7246953e2 (patch)
tree20a821e8d16cb4326aa808c304240234cfeeaaa6 /meta/conf/machine/include/qemu.inc
parent3ae3b2ba8a20c44b20ff322690872ff3f2893bee (diff)
parentb6b37f065c5715c04442184ca20c86258f1c1714 (diff)
downloadpoky-fa7a4cd807bf819c11d79ac0b22d8dc7246953e2.tar.gz
Merge branch 'master' of ssh://git@git.moblin.org/poky
Diffstat (limited to 'meta/conf/machine/include/qemu.inc')
-rw-r--r--meta/conf/machine/include/qemu.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index c1e83ba7f6..005472b170 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -5,7 +5,7 @@ GPE_EXTRA_INSTALL += "gaim sylpheed"
5 5
6MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen" 6MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
7 7
8IMAGE_FSTYPES ?= "tar.bz2 ext2" 8IMAGE_FSTYPES ?= "tar.bz2 ext3"
9 9
10ROOT_FLASH_SIZE = "280" 10ROOT_FLASH_SIZE = "280"
11IMAGE_ROOTFS_SIZE_ext2 ?= "280000" 11IMAGE_ROOTFS_SIZE_ext2 ?= "280000"