[oe-commits] Martin Jansa : shr/merge: Use glamo-kms by default

[git version control]

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

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Sat Oct 17 12:47:53 2009 +0000

shr/merge: Use glamo-kms by default

Signed-off-by: Klaus Kurzmann <mok at fluxnetz.de>

---

 conf/distro/include/shr-om-gta02-kms.conf         |    5 -----
 conf/distro/include/shr-om-gta02.conf             |    7 +++++--
 recipes/linux/linux-openmoko-shr-drm-devel_git.bb |    2 +-
 recipes/tasks/task-shr-feed.bb                    |    1 +
 recipes/xorg-driver/xf86-video-glamo-kms_git.bb   |    2 --
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/conf/distro/include/shr-om-gta02-kms.conf b/conf/distro/include/shr-om-gta02-kms.conf
deleted file mode 100644
index 2ddce41..0000000
--- a/conf/distro/include/shr-om-gta02-kms.conf
+++ /dev/null
@@ -1,5 +0,0 @@
-# SHR-specific overrides for building KMS enabled system
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-drm-devel"
-PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo-kms"
-
-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 070301e..bb01361 100644
--- a/conf/distro/include/shr-om-gta02.conf
+++ b/conf/distro/include/shr-om-gta02.conf
@@ -1,9 +1,12 @@
 # SHR-specific overrides to the machine.conf file
+
+# If you want to have KMS enabled in default kernel, uncomment linux-openmoko-shr-drm-devel
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
+#PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-drm-devel"
+
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo"
 PREFERRED_PROVIDER_virtual/libgl = "mesa-dri"
 MACHINE_DRI_MODULES = "glamo"
 
-XSERVER = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
+XSERVER = "xserver-xorg xf86-video-glamo-kms xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
 
diff --git a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
index 547be38..f96be42 100644
--- a/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
+++ b/recipes/linux/linux-openmoko-shr-drm-devel_git.bb
@@ -8,7 +8,7 @@ KERNEL_RELEASE = "2.6.29"
 KERNEL_VERSION = "2.6.29-rc3-drm"
 
 OMV = "oe13"
-PV = "${KERNEL_RELEASE}-${OMV}+gitr${SRCREV}"
+PV = "${KERNEL_RELEASE}-KMS-${OMV}+gitr${SRCREV}"
 PR = "r1"
 
 SRC_URI = "\
diff --git a/recipes/tasks/task-shr-feed.bb b/recipes/tasks/task-shr-feed.bb
index 0cb8021..872f385 100644
--- a/recipes/tasks/task-shr-feed.bb
+++ b/recipes/tasks/task-shr-feed.bb
@@ -123,6 +123,7 @@ RDEPENDS_${PN} += "\
 #		gpsdrive \
 		wxwidgets \
 		x11vnc \
+		xf86-video-glamo \
 #		libswt3.4-gtk-java \
 		cacao \
 #		jamvm \
diff --git a/recipes/xorg-driver/xf86-video-glamo-kms_git.bb b/recipes/xorg-driver/xf86-video-glamo-kms_git.bb
index 04cfd51..04e716f 100644
--- a/recipes/xorg-driver/xf86-video-glamo-kms_git.bb
+++ b/recipes/xorg-driver/xf86-video-glamo-kms_git.bb
@@ -2,8 +2,6 @@ require xorg-driver-video.inc
 SRC_URI = "git://git.openmoko.org/git/xf86-video-glamo.git;protocol=git;branch=kms \
            file://0001-Check-pScrn-variable-before-usage.patch;patch=1"
 
-PROVIDES = "xf86-video-glamo"
-
 S = "${WORKDIR}/git"
 
 PV=1.0.0+gitr${SRCREV}