summaryrefslogtreecommitdiffstats
path: root/meta/conf/machine/qemux86.conf
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2011-10-07 16:37:10 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-11 18:08:31 +0100
commitc09f0eb561a53b97a769dd0744076af7d904eafb (patch)
treeffdea22503027c6939e08c4e6ebc60b1c1346103 /meta/conf/machine/qemux86.conf
parent359006159996f95aaa7e53279229d72e161514bd (diff)
downloadpoky-c09f0eb561a53b97a769dd0744076af7d904eafb.tar.gz
xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite
* xserver-xorg is closer to upstream naming and that's how it's named in OE-classic and meta-oe? It would make meta-oe transition easier and better to do it now then convert meta-oe to xserver-xf86 and then rename it back later. (From OE-Core rev: 0b31c7200a368533df970f0efeb81e2e20c73593) Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf/machine/qemux86.conf')
-rw-r--r--meta/conf/machine/qemux86.conf6
1 files changed, 3 insertions, 3 deletions
diff --git a/meta/conf/machine/qemux86.conf b/meta/conf/machine/qemux86.conf
index 5d0d03e827..75c9042eb5 100644
--- a/meta/conf/machine/qemux86.conf
+++ b/meta/conf/machine/qemux86.conf
@@ -4,8 +4,8 @@
4 4
5PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" 5PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
6PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 6PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
7PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" 7PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
8PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" 8PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
9 9
10require conf/machine/include/tune-i586.inc 10require conf/machine/include/tune-i586.inc
11require conf/machine/include/qemu.inc 11require conf/machine/include/qemu.inc
@@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage"
17SERIAL_CONSOLE = "115200 ttyS0" 17SERIAL_CONSOLE = "115200 ttyS0"
18 18
19# We bypass swrast but we need it to be present for X to load correctly 19# We bypass swrast but we need it to be present for X to load correctly
20XSERVER ?= "xserver-xf86-dri-lite \ 20XSERVER ?= "xserver-xorg \
21 mesa-dri-driver-swrast \ 21 mesa-dri-driver-swrast \
22 xf86-input-vmmouse \ 22 xf86-input-vmmouse \
23 xf86-input-keyboard \ 23 xf86-input-keyboard \