From: Adrian Alonso <aalonso00@gmail.com>
Date: Tue, 3 Aug 2010 06:23:24 +0000 (+0000)
Subject: xserver-kdrive-common: Xsever module_id for virtex5 platform
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e827b4131ef609068d00578e696f62312393fb3a;p=openembedded.git

xserver-kdrive-common: Xsever module_id for virtex5 platform

* Return a valid module_id for xilinx virtex platform
* On Xilinx platforms there is no line `Hardware`. Instead it is
  stored in the line starting with `platform`.
* v2 split changes, nicer module_id function for handling xilinx
  virtex platforms

Signed-off-by: Adrian Alonso <aalonso00@gmail.com>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
---

diff --git a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
index 347b005c33..b6c27dfc4f 100644
--- a/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
+++ b/recipes/xserver-kdrive-common/xserver-kdrive-common/Xserver
@@ -34,7 +34,11 @@ module_id() {
     # grep "Module ID" /proc/hal/assets | sed "s/.*://"
     ## used to read from /proc/hal/model, but that is removed in 2.6
     # echo ' iPAQ' `cat /proc/hal/model`
-    awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+    id=`awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo`
+    if [ -n "$id" ]; then
+        id=`awk 'BEGIN { FS=": " } /platform/ { print $2 } ' </proc/cpuinfo`
+    fi
+    echo -n "$id"
 }
 
 export USER=root