[yocto] [PATCH 04/10] meta-crownbay: xserver-xorg renaming updates
tom.zanussi at intel.com
tom.zanussi at intel.com
Thu Oct 13 21:08:41 PDT 2011
From: Tom Zanussi <tom.zanussi at intel.com>
Update crownbay and crownbay-noemgd to reflect the new xserver-xorg
naming.
Signed-off-by: Tom Zanussi <tom.zanussi at intel.com>
---
meta-crownbay/conf/machine/crownbay-noemgd.conf | 14 +++++++++++---
meta-crownbay/conf/machine/crownbay.conf | 14 ++++++++++----
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%"
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-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
+ xserver-xorg-extension-dri \
+ xserver-xorg-extension-dri2 \
+ xserver-xorg-extension-glx \
+ xserver-xorg-extension-extmod \
+ xserver-xorg-extension-dbe \
+ xserver-xorg-module-libint10 \
xf86-input-mouse \
xf86-input-keyboard \
xf86-input-evdev \
xf86-input-synaptics \
xf86-video-vesa"
+PREFERRED_VERSION_xserver-xorg ?= "1.11.1"
+
SERIAL_CONSOLE = "115200 ttyS0"
MACHINE_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%"
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-xf86-dri-lite"
-PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xf86-dri-lite"
-XSERVER ?= "xserver-xf86-dri-lite \
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-xorg"
+PREFERRED_PROVIDER_virtual/xserver-xf86 ?= "xserver-xorg"
+XSERVER ?= "xserver-xorg \
+ xserver-xorg-extension-dri \
+ xserver-xorg-extension-dri2 \
+ xserver-xorg-extension-glx \
+ xserver-xorg-extension-extmod \
+ xserver-xorg-extension-dbe \
+ xserver-xorg-module-libint10 \
emgd-driver-bin \
xf86-input-mouse \
xf86-input-keyboard \
@@ -27,7 +33,7 @@ XSERVER ?= "xserver-xf86-dri-lite \
xf86-input-synaptics \
xf86-video-vesa"
-PREFERRED_VERSION_xserver-xf86-dri-lite ?= "1.9.3"
+PREFERRED_VERSION_xserver-xorg ?= "1.9.3"
PREFERRED_VERSION_emgd-driver-bin ?= "1.8"
SERIAL_CONSOLE = "115200 ttyS0"
--
1.7.0.4
More information about the yocto
mailing list