summaryrefslogtreecommitdiffstats
path: root/meta-yocto
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 23:22:53 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-14 23:25:41 +0100
commit0d69a17959a84f1b2245bb99fc89932ef062c20c (patch)
tree79cdb4091225cbc1762f68e10461ba010985a542 /meta-yocto
parent66bef6b137bc89f2798dd1fb9b0f057462d87fdc (diff)
downloadast2050-yocto-poky-0d69a17959a84f1b2245bb99fc89932ef062c20c.zip
ast2050-yocto-poky-0d69a17959a84f1b2245bb99fc89932ef062c20c.tar.gz
meta-yocto: Sync with mesa/xserver changes and fix machines
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta-yocto')
-rw-r--r--meta-yocto/conf/machine/atom-pc.conf10
-rw-r--r--meta-yocto/conf/machine/beagleboard.conf4
-rw-r--r--meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend2
3 files changed, 10 insertions, 6 deletions
diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
index 734e5b5..4bab4c8 100644
--- a/meta-yocto/conf/machine/atom-pc.conf
+++ b/meta-yocto/conf/machine/atom-pc.conf
@@ -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 \
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index 1b89c43..03e6e39 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -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 \
diff --git a/meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend b/meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend
index 61d3891..7e8e773 100644
--- a/meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend
+++ b/meta-yocto/recipes-graphics/mesa/mesa-dri_7.11.bbappend
@@ -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"
OpenPOWER on IntegriCloud