summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine
diff options
context:
space:
mode:
Diffstat (limited to 'meta/conf/machine')
-rw-r--r--meta/conf/machine/include/ia32-base.inc4
-rw-r--r--meta/conf/machine/include/qemu.inc8
-rw-r--r--meta/conf/machine/qemux86-64.conf8
-rw-r--r--meta/conf/machine/qemux86.conf8
4 files changed, 14 insertions, 14 deletions
diff --git a/meta/conf/machine/include/ia32-base.inc b/meta/conf/machine/include/ia32-base.inc
index 0798bf88c1..921c740772 100644
--- a/meta/conf/machine/include/ia32-base.inc
+++ b/meta/conf/machine/include/ia32-base.inc
@@ -39,11 +39,11 @@ XSERVER_IA32_EXT = " \
39 " 39 "
40 40
41XSERVER_IA32_I915 = "xf86-video-intel \ 41XSERVER_IA32_I915 = "xf86-video-intel \
42 mesa-dri-driver-i915 \ 42 mesa-driver-i915 \
43 " 43 "
44 44
45XSERVER_IA32_I965 = "xf86-video-intel \ 45XSERVER_IA32_I965 = "xf86-video-intel \
46 mesa-dri-driver-i965 \ 46 mesa-driver-i965 \
47 " 47 "
48 48
49XSERVER_IA32_VESA = "xf86-video-vesa" 49XSERVER_IA32_VESA = "xf86-video-vesa"
diff --git a/meta/conf/machine/include/qemu.inc b/meta/conf/machine/include/qemu.inc
index 52215b3930..29caec9559 100644
--- a/meta/conf/machine/include/qemu.inc
+++ b/meta/conf/machine/include/qemu.inc
@@ -1,10 +1,10 @@
1PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 1PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
2PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 2PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
3PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri" 3PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
4PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri" 4PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
5 5
6XSERVER ?= "xserver-xorg \ 6XSERVER ?= "xserver-xorg \
7 mesa-dri-driver-swrast \ 7 mesa-driver-swrast \
8 xf86-input-evdev \ 8 xf86-input-evdev \
9 xf86-input-mouse \ 9 xf86-input-mouse \
10 xf86-video-fbdev \ 10 xf86-video-fbdev \
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf
index 3852b89932..23a710848e 100644
--- a/meta/conf/machine/qemux86-64.conf
+++ b/meta/conf/machine/qemux86-64.conf
@@ -3,9 +3,9 @@
3#@DESCRIPTION: Machine configuration for running a common x86 3#@DESCRIPTION: Machine configuration for running a common x86
4 4
5PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 5PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
6PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 6PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
7PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri" 7PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
8PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri" 8PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
9 9
10require conf/machine/include/tune-x86_64.inc 10require conf/machine/include/tune-x86_64.inc
11 11
@@ -14,7 +14,7 @@ KERNEL_IMAGETYPE = "bzImage"
14SERIAL_CONSOLE = "115200 ttyS0" 14SERIAL_CONSOLE = "115200 ttyS0"
15 15
16XSERVER ?= "xserver-xorg \ 16XSERVER ?= "xserver-xorg \
17 mesa-dri-driver-swrast \ 17 mesa-driver-swrast \
18 xf86-input-vmmouse \ 18 xf86-input-vmmouse \
19 xf86-input-keyboard \ 19 xf86-input-keyboard \
20 xf86-input-evdev \ 20 xf86-input-evdev \
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index ee14bec974..d13dc847f0 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -3,9 +3,9 @@
3#@DESCRIPTION: Machine configuration for running a common x86 3#@DESCRIPTION: Machine configuration for running a common x86
4 4
5PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" 5PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
6PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 6PREFERRED_PROVIDER_virtual/libgl ?= "mesa"
7PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa-dri" 7PREFERRED_PROVIDER_virtual/libgles1 ?= "mesa"
8PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa-dri" 8PREFERRED_PROVIDER_virtual/libgles2 ?= "mesa"
9 9
10require conf/machine/include/tune-i586.inc 10require conf/machine/include/tune-i586.inc
11 11
@@ -14,7 +14,7 @@ KERNEL_IMAGETYPE = "bzImage"
14SERIAL_CONSOLE = "115200 ttyS0" 14SERIAL_CONSOLE = "115200 ttyS0"
15 15
16XSERVER ?= "xserver-xorg \ 16XSERVER ?= "xserver-xorg \
17 mesa-dri-driver-swrast \ 17 mesa-driver-swrast \
18 xf86-input-vmmouse \ 18 xf86-input-vmmouse \
19 xf86-input-keyboard \ 19 xf86-input-keyboard \
20 xf86-input-evdev \ 20 xf86-input-evdev \