summaryrefslogtreecommitdiffstats
path: root/meta-fri2/conf/machine/fri2.conf
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-10-12 15:25:08 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2011-10-16 03:01:04 (GMT)
commit97d28fee696de901caf6a8c6f22c9c4f31b8693c (patch)
treee5929626da8ce65e501abbeff7ebeff97d4d68c9 /meta-fri2/conf/machine/fri2.conf
parent7197e8e91127c84485033f89014ba332f18db424 (diff)
downloadmeta-intel-97d28fee696de901caf6a8c6f22c9c4f31b8693c.tar.gz
meta-fri2: xserver-xorg renaming updates
Update fri2 and fri2-noemgd to reflect the new xserver-xorg naming. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-fri2/conf/machine/fri2.conf')
-rw-r--r--meta-fri2/conf/machine/fri2.conf14
1 files changed, 10 insertions, 4 deletions
diff --git a/meta-fri2/conf/machine/fri2.conf b/meta-fri2/conf/machine/fri2.conf
index eab4b50..e73d28f 100644
--- a/meta-fri2/conf/machine/fri2.conf
+++ b/meta-fri2/conf/machine/fri2.conf
@@ -17,16 +17,22 @@ PREFERRED_VERSION_linux-yocto ?= "3.0%"
17PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto" 17PREFERRED_PROVIDER_linux-libc-headers ?= "linux-libc-headers-yocto"
18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim" 18PREFERRED_PROVIDER_virtual/libx11 ?= "libx11-trim"
19PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri" 19PREFERRED_PROVIDER_virtual/libgl ?= "mesa-dri"
20PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xf86-dri-lite" 20PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
21PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite" 21PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
22XSERVER ?= "xserver-xf86-dri-lite \ 22XSERVER ?= "xserver-xorg \
23 xserver-xorg-extension-dri \
24 xserver-xorg-extension-dri2 \
25 xserver-xorg-extension-glx \
26 xserver-xorg-extension-extmod \
27 xserver-xorg-extension-dbe \
28 xserver-xorg-module-libint10 \
23 xf86-input-mouse \ 29 xf86-input-mouse \
24 xf86-input-keyboard \ 30 xf86-input-keyboard \
25 xf86-input-evdev \ 31 xf86-input-evdev \
26 xf86-input-synaptics \ 32 xf86-input-synaptics \
27 emgd-driver-bin" 33 emgd-driver-bin"
28 34
29PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3" 35PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
30PREFERRED_VERSION_emgd-driver-bin ?= "1.8" 36PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
31 37
32SERIAL_CONSOLE = "115200 ttyS0" 38SERIAL_CONSOLE = "115200 ttyS0"