[poky] [PATCH 1/1] atom-pc.conf, beagleboard.conf: rename xserver-xf86-dri-lite to xserver-xorg

Dexuan Cui dexuan.cui at intel.com
Wed Oct 12 00:09:05 PDT 2011


Recently the commit c09f0eb561a53b97a769dd0744076af7d904eafb
(xserver-xf86(-dri)-lite: rename to xserver-xorg and xserver-xorg-lite)
breaks BSP building.
This patch makes changes accordingly.

Fixes bug [YOCTO #1670]

Signed-off-by: Dexuan Cui <dexuan.cui at intel.com>
Cc: Martin Jansa <Martin.Jansa at gmail.com>
---
 meta-yocto/conf/machine/atom-pc.conf     |    6 +++---
 meta-yocto/conf/machine/beagleboard.conf |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/meta-yocto/conf/machine/atom-pc.conf b/meta-yocto/conf/machine/atom-pc.conf
index da795cd..becac4f 100644
--- a/meta-yocto/conf/machine/atom-pc.conf
+++ b/meta-yocto/conf/machine/atom-pc.conf
@@ -15,9 +15,9 @@ 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 \
            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 \
-- 
1.7.6




More information about the poky mailing list