summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRoss Burton <ross@openedhand.com>2008-08-04 13:45:06 +0000
committerRoss Burton <ross@openedhand.com>2008-08-04 13:45:06 +0000
commit4f1efa2226096e30d06e6b3e3e3eff5b4c225d6a (patch)
treea29fae482892fc1524c7f2f77ccc109e914b8374 /meta
parentcf55538e50b59558da695c921d40b3d7921440ef (diff)
downloadopenembedded-core-4f1efa2226096e30d06e6b3e3e3eff5b4c225d6a.tar.gz
openembedded-core-4f1efa2226096e30d06e6b3e3e3eff5b4c225d6a.tar.bz2
openembedded-core-4f1efa2226096e30d06e6b3e3e3eff5b4c225d6a.tar.xz
openembedded-core-4f1efa2226096e30d06e6b3e3e3eff5b4c225d6a.zip
initscripts: merge OE change of cpuinfo_id to machine_id, fixing gsmd's startup
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5016 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/initscripts/initscripts-1.0/functions4
-rw-r--r--meta/packages/initscripts/initscripts_1.0.bb2
2 files changed, 3 insertions, 3 deletions
diff --git a/meta/packages/initscripts/initscripts-1.0/functions b/meta/packages/initscripts/initscripts-1.0/functions
index 514618770..689fd32b3 100644
--- a/meta/packages/initscripts/initscripts-1.0/functions
+++ b/meta/packages/initscripts/initscripts-1.0/functions
@@ -4,8 +4,8 @@
# shell scripts in the /etc/init.d directory.
#
-cpuinfo_id() { # return the Hardware module ID
- awk 'BEGIN { FS=": " } /Hardware/ { print $2 } ' </proc/cpuinfo
+machine_id() { # return the machine ID
+ awk 'BEGIN { FS=": " } /Hardware/ { gsub(" ", "_", $2); print tolower($2) } ' </proc/cpuinfo
}
killproc() { # kill the named process(es)
diff --git a/meta/packages/initscripts/initscripts_1.0.bb b/meta/packages/initscripts/initscripts_1.0.bb
index d2fc3d5e5..377cc1410 100644
--- a/meta/packages/initscripts/initscripts_1.0.bb
+++ b/meta/packages/initscripts/initscripts_1.0.bb
@@ -4,7 +4,7 @@ PRIORITY = "required"
DEPENDS = "makedevs"
RDEPENDS = "makedevs"
LICENSE = "GPL"
-PR = "r116"
+PR = "r117"
SRC_URI = "file://functions \
file://halt \