[oe] [PATCH 07/10] initscripts: module id xilinx virtex
Adrian Alonso
aalonso00 at gmail.com
Fri Jul 30 15:42:32 UTC 2010
* Add machine_id support for xilinx virtex platforms
used in xserver-common for args settings
* Bump PR
Signed-off-by: Adrian Alonso <aalonso00 at gmail.com>
---
recipes/initscripts/files/functions | 7 ++++++-
recipes/initscripts/initscripts_1.0.bb | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/recipes/initscripts/files/functions b/recipes/initscripts/files/functions
index fb9a914..3e7d687 100644
--- a/recipes/initscripts/files/functions
+++ b/recipes/initscripts/files/functions
@@ -5,7 +5,12 @@
#
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
+ echo -n "${id}"
+ else
+ awk 'BEGIN { FS=": " } /platform/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo
+ fi
}
killproc() { # kill the named process(es)
diff --git a/recipes/initscripts/initscripts_1.0.bb b/recipes/initscripts/initscripts_1.0.bb
index 1b0a94c..38fe85e 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 \
--
1.7.2
More information about the Openembedded-devel
mailing list