summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <richard@openedhand.com>2007-01-08 23:57:52 +0000
committerRichard Purdie <richard@openedhand.com>2007-01-08 23:57:52 +0000
commit1cacbe3d99af0d21e84d41411e4536288221c404 (patch)
tree9ea8bf5c01aecdb175ae42c1a74670d1b58b7256
parent10b9b4aa9d697875d8dd211b2dcce6b63390a486 (diff)
downloadopenembedded-core-1cacbe3d99af0d21e84d41411e4536288221c404.tar.gz
openembedded-core-1cacbe3d99af0d21e84d41411e4536288221c404.tar.bz2
openembedded-core-1cacbe3d99af0d21e84d41411e4536288221c404.tar.xz
openembedded-core-1cacbe3d99af0d21e84d41411e4536288221c404.zip
machine/qemu: Set image size in common file
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1132 311d38ba-8fff-0310-9ca6-ca027cbcb966
-rw-r--r--meta/conf/machine/include/qemu.conf5
-rw-r--r--meta/conf/machine/qemuarm.conf2
-rw-r--r--meta/conf/machine/qemux86.conf2
3 files changed, 3 insertions, 6 deletions
diff --git a/meta/conf/machine/include/qemu.conf b/meta/conf/machine/include/qemu.conf
index 83ddf24b8..26b78a6a9 100644
--- a/meta/conf/machine/include/qemu.conf
+++ b/meta/conf/machine/include/qemu.conf
@@ -3,8 +3,9 @@ PREFERRED_PROVIDER_xserver = "xserver-kdrive"
GUI_MACHINE_CLASS = "bigscreen"
GPE_EXTRA_INSTALL += "gaim sylpheed"
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget screen"
IMAGE_FSTYPES ?= "tar.bz2 ext2"
-ROOT_FLASH_SIZE = "100"
+ROOT_FLASH_SIZE = "200"
+IMAGE_ROOTFS_SIZE_ext2 = "200000"
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index 3c2cdf9eb..2de34e42c 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -13,5 +13,3 @@ SERIAL_CONSOLE = "115200 ttyAMA0"
PREFERRED_PROVIDER_virtual/kernel = "linux-rp"
MACHINE_TASK_PROVIDER = "task-base"
-
-IMAGE_ROOTFS_SIZE_ext2 = "200000"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 3ac81e5e6..dfbd345ae 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -15,5 +15,3 @@ GLIBC_ADDONS = "nptl"
GLIBC_EXTRA_OECONF = "--with-tls"
MACHINE_TASK_PROVIDER = "task-base"
-
-IMAGE_ROOTFS_SIZE_ext2 = "200000"