[oe-commits] Martin Jansa : Include only shr-om-gta02-xorg.conf, leave shr-om-gta02-kms. conf for shr-experimental. xf86-video-glamo back to AUTOREV as libdrm patches already pushed. Add AUTOREV for xf86-input-mouse and xf86-input-keyboard shouldn' t be needed but some

[git version control]

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

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Fri Sep 18 08:12:44 2009 +0000

Include only shr-om-gta02-xorg.conf, leave shr-om-gta02-kms.conf for shr-experimental. xf86-video-glamo back to AUTOREV as libdrm patches already pushed. Add AUTOREV for xf86-input-mouse and xf86-input-keyboard shouldn't be needed but some

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

---

 conf/distro/include/shr-om-gta01-xorg.conf |    2 ++
 conf/distro/include/shr-om-gta02-kms.conf  |    3 +--
 conf/distro/include/shr-om-gta02-xorg.conf |    2 ++
 conf/distro/shr.conf                       |    2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/conf/distro/include/shr-om-gta01-xorg.conf b/conf/distro/include/shr-om-gta01-xorg.conf
index 8abb956..b90a185 100644
--- a/conf/distro/include/shr-om-gta01-xorg.conf
+++ b/conf/distro/include/shr-om-gta01-xorg.conf
@@ -5,3 +5,5 @@ PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg"
 SRCREV_pn-xf86-video-glamo = "${AUTOREV}"
+SRCREV_pn-xf86-input-mouse = "${AUTOREV}"
+SRCREV_pn-xf86-input-keyboard = "${AUTOREV}"
diff --git a/conf/distro/include/shr-om-gta02-kms.conf b/conf/distro/include/shr-om-gta02-kms.conf
index d5a54b7..262fd60 100644
--- a/conf/distro/include/shr-om-gta02-kms.conf
+++ b/conf/distro/include/shr-om-gta02-kms.conf
@@ -16,7 +16,6 @@ MACHINE_DRI_MODULES = "glamo"
 SRCREV_pn-xserver-xorg = "${AUTOREV}"
 SRCREV_pn-libdrm-glamo = "${AUTOREV}"
 SRCREV_pn-mesa-dri-glamo = "${AUTOREV}"
-SRCREV_pn-xf86-video-glamo-kms = "3bc55d4f6b0a95637d85188782811fef600010eb"
-#SRCREV_pn-xf86-video-glamo-kms = "${AUTOREV}"
+SRCREV_pn-xf86-video-glamo-kms = "${AUTOREV}"
 SRCREV_pn-glamo-dri-tests = "${AUTOREV}"
 SRCREV_pn-linux-openmoko-shr-drm-devel = "${AUTOREV}"
diff --git a/conf/distro/include/shr-om-gta02-xorg.conf b/conf/distro/include/shr-om-gta02-xorg.conf
index 5b80876..89e4e28 100644
--- a/conf/distro/include/shr-om-gta02-xorg.conf
+++ b/conf/distro/include/shr-om-gta02-xorg.conf
@@ -5,3 +5,5 @@ PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo"
 PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
 XSERVER = "xserver-xorg"
 SRCREV_pn-xf86-video-glamo = "${AUTOREV}"
+SRCREV_pn-xf86-input-mouse = "${AUTOREV}"
+SRCREV_pn-xf86-input-keyboard = "${AUTOREV}"
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index baa8b7b..478015b 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -9,7 +9,7 @@
 # it will be already set to en-gb
 IMAGE_LINGUAS ?= "en-us"
 
-require conf/distro/include/shr-om-gta02-kms.conf
+require conf/distro/include/shr-om-gta02-xorg.conf
 require conf/distro/include/preferred-shr-versions.inc
 require conf/distro/include/angstrom-2007-for-openmoko.inc