* 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 <aalons...@gmail.com> --- recipes/initscripts/files/functions | 6 +++++- 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 fb9a914..51c1f13 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 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 _______________________________________________ Openembedded-devel mailing list Openembedded-devel@lists.openembedded.org http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel