[oe] [PATCH 2/2] Fix preferred provider for mesa

[Martin.Jansa]

---
 conf/distro/include/preferred-shr-versions.inc |    2 --
 conf/distro/include/shr-om-gta02-kms.conf      |    3 ---
 conf/distro/include/shr-om-gta02.conf          |    4 ++--
 conf/machine/om-gta02.conf                     |    1 -
 4 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/conf/distro/include/preferred-shr-versions.inc b/conf/distro/include/preferred-shr-versions.inc
index 1df8df2..6b1d3bf 100644
--- a/conf/distro/include/preferred-shr-versions.inc
+++ b/conf/distro/include/preferred-shr-versions.inc
@@ -1207,8 +1207,6 @@ PREFERRED_VERSION_mdev ?= "1.2.1"
 PREFERRED_VERSION_mdk2 ?= "v33"
 PREFERRED_VERSION_memedit ?= "0.7"
 PREFERRED_VERSION_memtester ?= "4.0.6"
-PREFERRED_VERSION_mesa ?= "7.4"
-PREFERRED_VERSION_mesa-dri ?= "7.5.1"
 PREFERRED_VERSION_meta-e-x11 ?= "1.0"
 PREFERRED_VERSION_meta-e-x11-core ?= "1.0"
 PREFERRED_VERSION_meta-gpe ?= "1.0"
diff --git a/conf/distro/include/shr-om-gta02-kms.conf b/conf/distro/include/shr-om-gta02-kms.conf
index d57cc35..2ddce41 100644
--- a/conf/distro/include/shr-om-gta02-kms.conf
+++ b/conf/distro/include/shr-om-gta02-kms.conf
@@ -1,8 +1,5 @@
 # SHR-specific overrides for building KMS enabled system
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-drm-devel"
-PREFERRED_PROVIDER_mesa = "mesa-dri"
 PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo-kms"
 
-MACHINE_DRI_MODULES = "glamo"
-
 XSERVER = "xserver-xorg xf86-video-glamo-kms xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
diff --git a/conf/distro/include/shr-om-gta02.conf b/conf/distro/include/shr-om-gta02.conf
index e66fba5..78d8e24 100644
--- a/conf/distro/include/shr-om-gta02.conf
+++ b/conf/distro/include/shr-om-gta02.conf
@@ -2,8 +2,8 @@
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo"
-PREFERRED_PROVIDER_mesa = "mesa"
-PREFERRED_PROVIDER_drm = "libdrm"
+PREFERRED_PROVIDER_mesa = "mesa-dri"
+MACHINE_DRI_MODULES = "glamo"
 
 XSERVER = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
 
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index ff7e8c0..ca45ddf 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -8,7 +8,6 @@ TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-stable"
 PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive-glamo"
-PREFERRED_PROVIDER_mesa ?= "mesa-dri"
 UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
-- 
1.6.5