diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2011-10-07 16:37:10 +0200 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-11 18:08:31 +0100 |
| commit | c09f0eb561a53b97a769dd0744076af7d904eafb (patch) | |
| tree | ffdea22503027c6939e08c4e6ebc60b1c1346103 /meta/conf/machine | |
| parent | 359006159996f95aaa7e53279229d72e161514bd (diff) | |
| download | openembedded-core-contrib-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')
| -rw-r--r-- | meta/conf/machine/qemux86-64.conf | 6 | ||||
| -rw-r--r-- | meta/conf/machine/qemux86.conf | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/conf/machine/qemux86-64.conf b/meta/conf/machine/qemux86-64.conf index 18a75138a8..f28cf0819b 100644 --- a/meta/conf/machine/qemux86-64.conf +++ b/meta/conf/machine/qemux86-64.conf @@ -4,8 +4,8 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" require conf/machine/include/tune-x86_64.inc require conf/machine/include/qemu.inc @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLE = "115200 ttyS0" # We bypass swrast but we need it to be present for X to load correctly -XSERVER ?= "xserver-xf86-dri-lite \ +XSERVER ?= "xserver-xorg \ mesa-dri-driver-swrast \ xf86-input-vmmouse \ xf86-input-keyboard \ 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 @@ PREFERRED_PROVIDER_virtual/libgl = "mesa-dri" PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" -PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" -PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" +PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg" +PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg" require conf/machine/include/tune-i586.inc require conf/machine/include/qemu.inc @@ -17,7 +17,7 @@ KERNEL_IMAGETYPE = "bzImage" SERIAL_CONSOLE = "115200 ttyS0" # We bypass swrast but we need it to be present for X to load correctly -XSERVER ?= "xserver-xf86-dri-lite \ +XSERVER ?= "xserver-xorg \ mesa-dri-driver-swrast \ xf86-input-vmmouse \ xf86-input-keyboard \ |