diff options
| author | Adrian Alonso <aalonso00@gmail.com> | 2010-08-03 06:23:21 +0000 |
|---|---|---|
| committer | Frans Meulenbroeks <fransmeulenbroeks@gmail.com> | 2010-08-04 19:47:03 +0200 |
| commit | d54cdeee2d34518442f0f685bb5e494047f4ce4b (patch) | |
| tree | e3966ebc484d268d3855f62ea8e0ace512b0ff05 | |
| parent | 87007db499894b940f2a457f8427128448f4f9d0 (diff) | |
initscripts: functions machine id xilinx virtex5 platforms
* Add machine_id support for xilinx virtex platforms
used in xserver-common for args settings.
* On Xilinx platforms there is no line `Hardware`. Instead it is
stored in the line starting with `platform`.
* Bump PR
* v2 nicer machine_id function for handling xilinx virtex platforms
Signed-off-by: Adrian Alonso <aalonso00@gmail.com>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>
| -rw-r--r-- | recipes/initscripts/files/functions | 6 | ||||
| -rw-r--r-- | recipes/initscripts/initscripts_1.0.bb | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/recipes/initscripts/files/functions b/recipes/initscripts/files/functions index fb9a914e4d..51c1f13261 100644 --- a/recipes/initscripts/files/functions +++ b/recipes/initscripts/files/functions @@ -5,7 +5,11 @@ # machine_id() { # return the machine ID - awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo + id=`awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo` + if [ -n "$id" ]; then + id=`awk 'BEGIN { FS=": " } /platform/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo` + fi + echo -n "$id" } killproc() { # kill the named process(es) diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb index 1b0a94c221..38fe85e650 100644 --- a/recipes/initscripts/initscripts_1.0.bb +++ b/recipes/initscripts/initscripts_1.0.bb @@ -4,7 +4,7 @@ PRIORITY = "required" DEPENDS = "makedevs" RDEPENDS_${PN} = "makedevs" LICENSE = "GPL" -PR = "r121" +PR = "r122" SRC_URI = "file://functions \ file://halt \ |