[oe-commits] Martin Jansa : om-gta02.conf: set MACHINE_DRI_MODULES = glamo only for shr as it needs mesa-dri_git.bb

[git version control]

Module: openembedded.git
Branch: shr/merge
Commit: cc4ed9b2bcfc08bb4d9753c076ee83c1381c5a0d
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=cc4ed9b2bcfc08bb4d9753c076ee83c1381c5a0d

Author: Martin Jansa <Martin.Jansa at gmail.com>
Date:   Wed Dec 30 13:27:02 2009 +0100

om-gta02.conf: set MACHINE_DRI_MODULES = glamo only for shr as it needs mesa-dri_git.bb

Signed-off-by: Martin Jansa <Martin.Jansa at gmail.com>

---

 conf/machine/om-gta02.conf |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index c65d971..12cea67 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -15,8 +15,9 @@ PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
 #PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-2.6.31"
 
 PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg"
-PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
-MACHINE_DRI_MODULES = "glamo"
+PREFERRED_PROVIDER_virtual/libgl_shr = "mesa-dri"
+# Override only for shr as it needs mesa-dri_git and ie angstrom has preferred_version set to 7.6
+MACHINE_DRI_MODULES_shr = "glamo"
 
 XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"