[oe-commits] Klaus Kurzmann : shr: set correct XSERVER, move xorg revs to shr-autorev

[git version control]

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

Author: Klaus Kurzmann <mok at fluxnetz.de>
Date:   Sat Sep 26 17:30:04 2009 +0200

shr: set correct XSERVER, move xorg revs to shr-autorev
and move preferred providers to the SHR machine config files.

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

---

 conf/distro/include/shr-autorev-unstable.inc |   11 +++++++++++
 conf/distro/include/shr-om-gta01.conf        |    8 ++++++++
 conf/distro/include/shr-om-gta02.conf        |    9 +++++++--
 conf/distro/shr.conf                         |    1 -
 conf/machine/om-gta01.conf                   |    2 +-
 conf/machine/om-gta02.conf                   |    4 ++--
 6 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/conf/distro/include/shr-autorev-unstable.inc b/conf/distro/include/shr-autorev-unstable.inc
index 6316b21..bac6241 100644
--- a/conf/distro/include/shr-autorev-unstable.inc
+++ b/conf/distro/include/shr-autorev-unstable.inc
@@ -5,6 +5,17 @@
 # KERNEL
 SRCREV_pn-linux-openmoko-shr-devel = "${AUTOREV}"
 
+# X11
+require conf/distro/include/preferred-xorg-versions-live.inc
+SRCREV_pn-xf86-video-glamo = "${AUTOREV}"
+SRCREV_pn-xf86-input-mouse = "${AUTOREV}"
+SRCREV_pn-xf86-input-keyboard = "${AUTOREV}"
+SRCREV_pn-xf86-video-glamo-kms = "${AUTOREV}"
+SRCREV_pn-glamo-dri-tests = "${AUTOREV}"
+SRCREV_pn-mesa-dri-glamo = "${AUTOREV}"
+SRCREV_pn-libdrm-glamo = "${AUTOREV}"
+SRCREV_pn-xserver-xorg = "${AUTOREV}"
+
 # FSO stuff
 FSOREV_cornucopia = "${AUTOREV}"
 SRCREV_pn-dbus-hlid = "${AUTOREV}"
diff --git a/conf/distro/include/shr-om-gta01.conf b/conf/distro/include/shr-om-gta01.conf
index 2d830d4..4aff7e4 100644
--- a/conf/distro/include/shr-om-gta01.conf
+++ b/conf/distro/include/shr-om-gta01.conf
@@ -1,2 +1,10 @@
 # SHR-specific overrides to the machine.conf file
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+PREFERRED_PROVIDER_xf86-video-fbdev = "xf86-video-fbdev"
+PREFERRED_PROVIDER_mesa = "mesa"
+PREFERRED_PROVIDER_drm = "libdrm"
+
+XSERVER = "xserver-xorg xf86-video-fbdev xf86-input-evdev xf86-input-keyboard"
+
+
diff --git a/conf/distro/include/shr-om-gta02.conf b/conf/distro/include/shr-om-gta02.conf
index 900916c..e66fba5 100644
--- a/conf/distro/include/shr-om-gta02.conf
+++ b/conf/distro/include/shr-om-gta02.conf
@@ -1,4 +1,9 @@
 # SHR-specific overrides to the machine.conf file
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-devel"
-PREFERRED_PROVIDER_mesa = "mesa-dri"
-PREFERRED_PROVIDER_dri = "libdrm"
+PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
+PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo"
+PREFERRED_PROVIDER_mesa = "mesa"
+PREFERRED_PROVIDER_drm = "libdrm"
+
+XSERVER = "xserver-xorg xf86-video-glamo xf86-input-evdev xf86-input-keyboard xf86-input-mouse"
+
diff --git a/conf/distro/shr.conf b/conf/distro/shr.conf
index 478015b..a9bb98f 100644
--- a/conf/distro/shr.conf
+++ b/conf/distro/shr.conf
@@ -9,7 +9,6 @@
 # it will be already set to en-gb
 IMAGE_LINGUAS ?= "en-us"
 
-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
 
diff --git a/conf/machine/om-gta01.conf b/conf/machine/om-gta01.conf
index f7f9966..fbaabea 100644
--- a/conf/machine/om-gta01.conf
+++ b/conf/machine/om-gta01.conf
@@ -14,7 +14,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
-XSERVER = "xserver-kdrive-fbdev"
+XSERVER ?= "xserver-kdrive-fbdev"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\
diff --git a/conf/machine/om-gta02.conf b/conf/machine/om-gta02.conf
index bb1decc..ca45ddf 100644
--- a/conf/machine/om-gta02.conf
+++ b/conf/machine/om-gta02.conf
@@ -7,7 +7,7 @@
 TARGET_ARCH = "arm"
 
 PREFERRED_PROVIDER_virtual/kernel ?= "linux-openmoko-stable"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-kdrive-glamo"
+PREFERRED_PROVIDER_virtual/xserver ?= "xserver-kdrive-glamo"
 UBOOT_ENTRYPOINT = "30008000"
 
 MACHINE_FEATURES = "kernel26 apm alsa bluetooth gps usbgadget usbhost phone wifi vfat ext2"
@@ -15,7 +15,7 @@ MACHINE_DISPLAY_WIDTH_PIXELS = "480"
 MACHINE_DISPLAY_HEIGHT_PIXELS = "640"
 MACHINE_DISPLAY_ORIENTATION = "0"
 MACHINE_DISPLAY_PPI = "285"
-XSERVER = "xserver-kdrive-glamo xserver-kdrive-fbdev"
+XSERVER ?= "xserver-kdrive-glamo xserver-kdrive-fbdev"
 
 # package machine specific modules
 MACHINE_EXTRA_RRECOMMENDS = "\