summaryrefslogtreecommitdiffstats
path: root/meta-crownbay/conf
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-10-12 15:18:59 (GMT)
committerTom Zanussi <tom.zanussi@intel.com>2011-10-16 02:59:12 (GMT)
commitc8d4d5133379f09f6f11d610c0cee770770ff12a (patch)
tree4b24b81cceb74d11c043734bc3e4b6e51ac79d24 /meta-crownbay/conf
parenta16c31818b1e781fe42c525bb1e2149741621c0f (diff)
downloadmeta-intel-c8d4d5133379f09f6f11d610c0cee770770ff12a.tar.gz
meta-crownbay: xserver-xorg renaming updates
Update crownbay and crownbay-noemgd to reflect the new xserver-xorg naming. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
Diffstat (limited to 'meta-crownbay/conf')
-rw-r--r--meta-crownbay/conf/machine/crownbay-noemgd.conf14
-rw-r--r--meta-crownbay/conf/machine/crownbay.conf14
2 files changed, 21 insertions, 7 deletions
diff --git a/meta-crownbay/conf/machine/crownbay-noemgd.conf b/meta-crownbay/conf/machine/crownbay-noemgd.conf
index c668f4a..bde9a5f 100644
--- a/meta-crownbay/conf/machine/crownbay-noemgd.conf
+++ b/meta-crownbay/conf/machine/crownbay-noemgd.conf
@@ -17,15 +17,23 @@ 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 xf86-video-vesa" 33 xf86-video-vesa"
28 34
35PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
36
29SERIAL_CONSOLE = "115200 ttyS0" 37SERIAL_CONSOLE = "115200 ttyS0"
30 38
31MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts" 39MACHINE_EXTRA_RRECOMMENDS = "kernel-modules eee-acpi-scripts"
diff --git a/meta-crownbay/conf/machine/crownbay.conf b/meta-crownbay/conf/machine/crownbay.conf
index 457bdfc..7f0b9d6 100644
--- a/meta-crownbay/conf/machine/crownbay.conf
+++ b/meta-crownbay/conf/machine/crownbay.conf
@@ -17,9 +17,15 @@ 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 emgd-driver-bin \ 29 emgd-driver-bin \
24 xf86-input-mouse \ 30 xf86-input-mouse \
25 xf86-input-keyboard \ 31 xf86-input-keyboard \
@@ -27,7 +33,7 @@ XSERVER ?= "xserver-xf86-dri-lite \
27 xf86-input-synaptics \ 33 xf86-input-synaptics \
28 xf86-video-vesa" 34 xf86-video-vesa"
29 35
30PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3" 36PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
31PREFERRED_VERSION_emgd-driver-bin ?= "1.8" 37PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
32 38
33SERIAL_CONSOLE = "115200 ttyS0" 39SERIAL_CONSOLE = "115200 ttyS0"