meta-yocto: Sync with mesa/xserver changes and fix machines

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Richard Purdie 2011-10-14 23:22:53 +01:00
parent 66bef6b137
commit 0d69a17959
3 changed files with 10 additions and 6 deletions

View File

@ -15,9 +15,13 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg-lite"
PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg-lite"
XSERVER ?= "xserver-xorg-lite \
PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
XSERVER ?= "xserver-xorg \
xserver-xorg-extension-dri2 \
xserver-xorg-extension-glx \
xserver-xorg-extension-extmod \
xserver-xorg-extension-dbe \
xf86-input-mouse \
xf86-input-keyboard \
xf86-input-evdev \

View File

@ -2,8 +2,8 @@
#@NAME: Beagleboard machine
#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board
PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-lite"
XSERVER = "xserver-xf86-lite \
PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg-lite"
XSERVER = "xserver-xorg-lite \
xf86-input-evdev \
xf86-input-mouse \
xf86-video-omapfb \

View File

@ -1,3 +1,3 @@
# Atom PCs have DRI support so use mesa-dri by default
DEFAULT_PREFERENCE_atom-pc = "1"
DEFAULT_PREFERENCE_atom-pc = "2"