fix to bug 1670

PATCH New Dexuan Cui 1 participant 2 messages Oct 12, 2011

lore

Share & tools

lore

Dexuan Cui

author

2011-10-12 07:09 UTC #0 lore raw

cover fix to bug 1670

The following changes since commit 7dfb9ce398a4ca62d2d53be9ddc7128e665d5126:

shared-mime-info: Fix a parallel make race (2011-10-11 18:08:38 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib dcui/fix_1670
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=dcui/fix_1670

Dexuan Cui (1):
atom-pc.conf, beagleboard.conf: rename xserver-xf86-dri-lite to
xserver-xorg

 meta-yocto/conf/machine/atom-pc.conf     |    6 +++---
 meta-yocto/conf/machine/beagleboard.conf |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

Signature · 1 line

1.7.6

Dexuan Cui

author

2011-10-12 07:09 UTC #1 lore raw

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

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 <[email protected]>

Cc Martin Jansa <[email protected]>

---
 meta-yocto/conf/machine/atom-pc.conf     |    6 +++---
 meta-yocto/conf/machine/beagleboard.conf |    4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

meta-yocto/conf/machine/atom-pc.conf +3 -3

index da795cd..becac4f 100644
@@ -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 \

meta-yocto/conf/machine/beagleboard.conf +2 -2

index 1b89c43..03e6e39 100644
@@ -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 \

Signature · 1 line

1.7.6