[oe-commits] Martin Jansa : Xorg: cleanup stuff in conf/distro/include as it' s included now directly

[git version control]

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

Author: Martin Jansa <martin.jansa at gmail.com>
Date:   Sun Sep 27 05:55:06 2009 +0000

Xorg: cleanup stuff in conf/distro/include as it's included now directly

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

---

 conf/distro/include/shr-autorev-unstable.inc |    1 +
 conf/distro/include/shr-om-gta01-kms.conf    |   21 ---------------------
 conf/distro/include/shr-om-gta01-xorg.conf   |    9 ---------
 conf/distro/include/shr-om-gta02-kms.conf    |   16 ++--------------
 conf/distro/include/shr-om-gta02-xorg.conf   |   16 ----------------
 5 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/conf/distro/include/shr-autorev-unstable.inc b/conf/distro/include/shr-autorev-unstable.inc
index bac6241..d942549 100644
--- a/conf/distro/include/shr-autorev-unstable.inc
+++ b/conf/distro/include/shr-autorev-unstable.inc
@@ -4,6 +4,7 @@
 
 # KERNEL
 SRCREV_pn-linux-openmoko-shr-devel = "${AUTOREV}"
+SRCREV_pn-linux-openmoko-shr-drm-devel = "${AUTOREV}"
 
 # X11
 require conf/distro/include/preferred-xorg-versions-live.inc
diff --git a/conf/distro/include/shr-om-gta01-kms.conf b/conf/distro/include/shr-om-gta01-kms.conf
deleted file mode 100644
index a120dcb..0000000
--- a/conf/distro/include/shr-om-gta01-kms.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-# SHR-specific overrides to the machine.conf file
-require shr-om-gta01-xorg.conf
-PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-drm-devel"
-PREFERRED_PROVIDER_mesa = "mesa-dri-glamo"
-PREFERRED_PROVIDER_drm = "libdrm-glamo"
-PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo-kms"
-
-PREFERRED_VERSION_xserver-xorg = "1.6.999+git%"
-PREFERRED_VERSION_libdrm-glamo = "2.4.4+git%"
-PREFERRED_VERSION_mesa-dri-glamo = "7.5.1+git%"
-PREFERRED_VERSION_xf86-video-glamo-kms = "1.0.0+git%"
-
-MACHINE_DRI_MODULES = "glamo"
-
-# The following bits are for accelerated Mesa
-SRCREV_pn-xserver-xorg = "${AUTOREV}"
-SRCREV_pn-libdrm-glamo = "${AUTOREV}"
-SRCREV_pn-mesa-dri-glamo = "${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-gta01-xorg.conf b/conf/distro/include/shr-om-gta01-xorg.conf
deleted file mode 100644
index b90a185..0000000
--- a/conf/distro/include/shr-om-gta01-xorg.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-# SHR-specific overrides to the machine.conf file
-require shr-om-gta01.conf
-require conf/distro/include/preferred-xorg-versions-live.inc
-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 262fd60..63cc6a9 100644
--- a/conf/distro/include/shr-om-gta02-kms.conf
+++ b/conf/distro/include/shr-om-gta02-kms.conf
@@ -1,21 +1,9 @@
-# SHR-specific overrides to the machine.conf file
-require shr-om-gta02-xorg.conf
+# SHR-specific overrides for building KMS enabled system
 PREFERRED_PROVIDER_virtual/kernel = "linux-openmoko-shr-drm-devel"
 PREFERRED_PROVIDER_mesa = "mesa-dri-glamo"
 PREFERRED_PROVIDER_drm = "libdrm-glamo"
 PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo-kms"
 
-PREFERRED_VERSION_xserver-xorg = "1.6.999+git%"
-PREFERRED_VERSION_libdrm-glamo = "2.4.4+git%"
-PREFERRED_VERSION_mesa-dri-glamo = "7.5.1+git%"
-PREFERRED_VERSION_xf86-video-glamo-kms = "1.0.0+git%"
-
 MACHINE_DRI_MODULES = "glamo"
 
-# The following bits are for accelerated Mesa
-SRCREV_pn-xserver-xorg = "${AUTOREV}"
-SRCREV_pn-libdrm-glamo = "${AUTOREV}"
-SRCREV_pn-mesa-dri-glamo = "${AUTOREV}"
-SRCREV_pn-xf86-video-glamo-kms = "${AUTOREV}"
-SRCREV_pn-glamo-dri-tests = "${AUTOREV}"
-SRCREV_pn-linux-openmoko-shr-drm-devel = "${AUTOREV}"
+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-xorg.conf b/conf/distro/include/shr-om-gta02-xorg.conf
deleted file mode 100644
index 5367ada..0000000
--- a/conf/distro/include/shr-om-gta02-xorg.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# SHR-specific overrides to the machine.conf file
-require shr-om-gta02.conf
-require conf/distro/include/preferred-xorg-versions-live.inc
-PREFERRED_PROVIDER_xf86-video-glamo = "xf86-video-glamo"
-PREFERRED_PROVIDER_virtual/xserver = "xserver-xorg"
-PREFERRED_PROVIDER_drm = "libdrm"
-PREFERRED_PROVIDER_mesa = "mesa"
-XSERVER = "xserver-xorg"
-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}"