om-gta0(1|2): set virtual/libgl provider without shr override

diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index 5bdeba0..e1c5127 100644 (file)
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -12,7 +12,7 @@ PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-2.6.24"
 PREFERRED_PROVIDER_virtual/kernel_shr = "linux-openmoko-shr-devel"
 PREFERRED_PROVIDER_virtual/xserver_shr = "xserver-xorg"
 PREFERRED_PROVIDER_xf86-video-fbdev_shr = "xf86-video-fbdev"
-PREFERRED_PROVIDER_mesa_shr = "mesa"
+PREFERRED_PROVIDER_virtual/libgl = "mesa"
 XSERVER_shr = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard"
 
 UBOOT_ENTRYPOINT = "30008000"

diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index 5fc96ec..8e8355b 100644 (file)
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -15,8 +15,8 @@ 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_shr = "mesa-dri"
-MACHINE_DRI_MODULES_shr = "glamo"
+PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
+MACHINE_DRI_MODULES = "glamo"
 
 XSERVER_shr = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"