summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-12-30 09:55:23 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-12-30 10:03:10 +0000
commit8e7680b629f59bdf3bdab6782235f8ea1decb188 (patch)
treef28708888f6bc997cadd768a0a09e05b11fb2f33
parent0e8f0f0a033c79611a15914fde5826876502af2e (diff)
downloadpoky-8e7680b629f59bdf3bdab6782235f8ea1decb188.tar.gz
update-rc.d: Allow the primary deamon package to be specified in UPDATERCPN, update gsmd to use this
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/classes/update-rc.d.bbclass6
-rw-r--r--meta/recipes-connectivity/gsm/gsmd.inc6
2 files changed, 6 insertions, 6 deletions
diff --git a/meta/classes/update-rc.d.bbclass b/meta/classes/update-rc.d.bbclass
index 57137c60b4..684f6a8fda 100644
--- a/meta/classes/update-rc.d.bbclass
+++ b/meta/classes/update-rc.d.bbclass
@@ -1,5 +1,7 @@
1UPDATERCPN ?= "${PN}"
2
1DEPENDS_append = " update-rc.d-native" 3DEPENDS_append = " update-rc.d-native"
2RDEPENDS_${PN}_append = " update-rc.d" 4RDEPENDS_${UPDATERCPN}_append = " update-rc.d"
3 5
4INITSCRIPT_PARAMS ?= "defaults" 6INITSCRIPT_PARAMS ?= "defaults"
5 7
@@ -69,7 +71,7 @@ python populate_packages_prepend () {
69 71
70 pkgs = bb.data.getVar('INITSCRIPT_PACKAGES', d, 1) 72 pkgs = bb.data.getVar('INITSCRIPT_PACKAGES', d, 1)
71 if pkgs == None: 73 if pkgs == None:
72 pkgs = bb.data.getVar('PN', d, 1) 74 pkgs = bb.data.getVar('UPDATERCPN', d, 1)
73 packages = (bb.data.getVar('PACKAGES', d, 1) or "").split() 75 packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
74 if not pkgs in packages and packages != []: 76 if not pkgs in packages and packages != []:
75 pkgs = packages[0] 77 pkgs = packages[0]
diff --git a/meta/recipes-connectivity/gsm/gsmd.inc b/meta/recipes-connectivity/gsm/gsmd.inc
index 9818188636..96de41ce4f 100644
--- a/meta/recipes-connectivity/gsm/gsmd.inc
+++ b/meta/recipes-connectivity/gsm/gsmd.inc
@@ -10,7 +10,7 @@ SECTION = "libs/gsm"
10PROVIDES += "gsmd" 10PROVIDES += "gsmd"
11RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel" 11RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
12PV = "0.1+svnr${SRCREV}" 12PV = "0.1+svnr${SRCREV}"
13PR = "r0" 13PR = "r2"
14 14
15SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ 15SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
16 file://fix_machine_init.patch;patch=1 \ 16 file://fix_machine_init.patch;patch=1 \
@@ -19,10 +19,8 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
19S = "${WORKDIR}/gsm" 19S = "${WORKDIR}/gsm"
20 20
21inherit autotools pkgconfig update-rc.d 21inherit autotools pkgconfig update-rc.d
22# handle update-rc.d RDEPENDS manually, we don't need it on
23# anything but gsmd
24RDEPENDS_append = ""
25 22
23UPDATERCPN = "gsmd"
26INITSCRIPT_NAME = "gsmd" 24INITSCRIPT_NAME = "gsmd"
27INITSCRIPT_PARAMS = "defaults 35" 25INITSCRIPT_PARAMS = "defaults 35"
28 26