summaryrefslogtreecommitdiffstats
path: root/meta-yocto/conf
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/conf
parent66bef6b137bc89f2798dd1fb9b0f057462d87fdc (diff)
downloadpoky-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/conf')
-rw-r--r--meta-yocto/conf/machine/atom-pc.conf10
-rw-r--r--meta-yocto/conf/machine/beagleboard.conf4
2 files changed, 9 insertions, 5 deletions
diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
index 734e5b5469..4bab4c8899 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%"
15#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 15#PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
16PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 16PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
17PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 17PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
18PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg-lite" 18PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
19PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg-lite" 19PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
20XSERVER ?= "xserver-xorg-lite \ 20XSERVER ?= "xserver-xorg \
21 xserver-xorg-extension-dri2 \
22 xserver-xorg-extension-glx \
23 xserver-xorg-extension-extmod \
24 xserver-xorg-extension-dbe \
21 xf86-input-mouse \ 25 xf86-input-mouse \
22 xf86-input-keyboard \ 26 xf86-input-keyboard \
23 xf86-input-evdev \ 27 xf86-input-evdev \
diff --git a/meta-yocto/conf/machine/beagleboard.conf b/meta-yocto/conf/machine/beagleboard.conf
index 1b89c43563..03e6e394a5 100644
--- a/meta-yocto/conf/machine/beagleboard.conf
+++ b/meta-yocto/conf/machine/beagleboard.conf
@@ -2,8 +2,8 @@
2#@NAME: Beagleboard machine 2#@NAME: Beagleboard machine
3#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board 3#@DESCRIPTION: Machine configuration for the http://beagleboard.org/ board
4 4
5PREFERRED_PROVIDER_virtual/xserver = "xserver-xf86-lite" 5PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg-lite"
6XSERVER = "xserver-xf86-lite \ 6XSERVER = "xserver-xorg-lite \
7 xf86-input-evdev \ 7 xf86-input-evdev \
8 xf86-input-mouse \ 8 xf86-input-mouse \
9 xf86-video-omapfb \ 9 xf86-video-omapfb \