3 files changed, 29 insertions, 12 deletions
diff --git a/meta/conf/machine/include/qemu.conf b/meta/conf/machine/include/qemu.conf
new file mode 100644
index 0000000000..8587c2ab2f
--- /dev/null
+++ b/meta/conf/machine/include/qemu.conf
@@ -0,0 +1,10 @@
+PCMCIA_MANAGER = "pcmciautils"
+PREFERRED_PROVIDER_xserver = "xserver-kdrive"
+GUI_MACHINE_CLASS = "bigscreen"
+GPE_EXTRA_INSTALL += "gaim sylpheed"
+
+MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
+
+IMAGE_FSTYPES ?= "tar.bz2"
+
+ROOT_FLASH_SIZE = "100"
diff --git a/meta/conf/machine/qemuarm.conf b/meta/conf/machine/qemuarm.conf
index cc4daa491f..a64a58e9a2 100644
--- a/meta/conf/machine/qemuarm.conf
+++ b/meta/conf/machine/qemuarm.conf
@@ -5,19 +5,9 @@
 TARGET_ARCH = "arm"
 IPKG_EXTRA_ARCHS = "armv4 armv5te"
 
-PCMCIA_MANAGER = "pcmciautils"
-PREFERRED_PROVIDER_xserver = "xserver-kdrive"
-GUI_MACHINE_CLASS = "bigscreen"
-GPE_EXTRA_INSTALL += "gaim sylpheed"
-
-include conf/machine/include/tune-arm926ejs.conf
+require conf/machine/include/qemu.conf
+require conf/machine/include/tune-arm926ejs.conf
 
 SERIAL_CONSOLE = "115200 ttyAMA0"
 
 PREFERRED_PROVIDER_virtual/kernel = "linux-openzaurus"
-
-MACHINE_FEATURES = "kernel26 apm alsa pcmcia bluetooth irda usbgadget"
-
-IMAGE_FSTYPES ?= "tar.bz2"
-
-ROOT_FLASH_SIZE = "100"
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
new file mode 100644
index 0000000000..340ad812c7
--- /dev/null
+++ b/meta/conf/machine/qemux86.conf
@@ -0,0 +1,17 @@
+#@TYPE: Machine
+#@NAME: qemu x86 Emulator setup
+#@DESCRIPTION: Machine configuration for running an x86 system under qemu emulation
+
+TARGET_ARCH = "i586"
+TARGET_VENDOR = "-oe"
+IPKG_EXTRA_ARCHS = "x86"
+
+require conf/machine/include/qemu.conf
+# require conf/machine/include/tune-arm926ejs.conf
+
+SERIAL_CONSOLE = "115200 ttyS0"
+
+PREFERRED_PROVIDER_virtual/kernel = "linux-x86"
+
+GLIBC_ADDONS = "nptl"
+GLIBC_EXTRA_OECONF = "--with-tls"