summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/qemu.inc9
-rw-r--r--meta/conf/machine/qemux86-64.conf3
-rw-r--r--meta/conf/machine/qemux86.conf3
3 files changed, 12 insertions, 3 deletions
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 421a14925b..e384879a8f 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -1,7 +1,14 @@
1PCMCIA_MANAGER = "pcmciautils" 1PCMCIA_MANAGER = "pcmciautils"
2PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive" 2PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
3PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib" 3PREFERRED_PROVIDER_virtual/libgl ?= "mesa-xlib"
4 4
5XSERVER ?= "xserver-xorg \
6 mesa-dri-driver-swrast \
7 xf86-input-evdev \
8 xf86-input-mouse \
9 xf86-video-fbdev \
10 xf86-input-keyboard"
11
5MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen" 12MACHINE_FEATURES = "apm alsa pcmcia bluetooth irda usbgadget screen"
6 13
7IMAGE_FSTYPES += "tar.bz2 ext3" 14IMAGE_FSTYPES += "tar.bz2 ext3"
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 129fe9f282..2e361a5cab 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -6,7 +6,6 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
6PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 6PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
7 7
8require conf/machine/include/tune-x86_64.inc 8require conf/machine/include/tune-x86_64.inc
9require conf/machine/include/qemu.inc
10 9
11MACHINE_FEATURES += "x86" 10MACHINE_FEATURES += "x86"
12 11
@@ -23,6 +22,8 @@ XSERVER ?= "xserver-xorg \
23 xf86-video-vmware \ 22 xf86-video-vmware \
24 qemugl" 23 qemugl"
25 24
25require conf/machine/include/qemu.inc
26
26GLIBC_ADDONS = "nptl" 27GLIBC_ADDONS = "nptl"
27GLIBC_EXTRA_OECONF = "--with-tls" 28GLIBC_EXTRA_OECONF = "--with-tls"
28 29
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 246d5a0c85..ad840c0498 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -6,7 +6,6 @@ PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
6PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 6PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
7 7
8require conf/machine/include/tune-i586.inc 8require conf/machine/include/tune-i586.inc
9require conf/machine/include/qemu.inc
10 9
11MACHINE_FEATURES += "x86" 10MACHINE_FEATURES += "x86"
12 11
@@ -23,6 +22,8 @@ XSERVER ?= "xserver-xorg \
23 xf86-video-vmware \ 22 xf86-video-vmware \
24 qemugl" 23 qemugl"
25 24
25require conf/machine/include/qemu.inc
26
26GLIBC_ADDONS = "nptl" 27GLIBC_ADDONS = "nptl"
27GLIBC_EXTRA_OECONF = "--with-tls" 28GLIBC_EXTRA_OECONF = "--with-tls"
28 29