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>
This commit is contained in:
parent
0e8f0f0a03
commit
8e7680b629
|
@ -1,5 +1,7 @@
|
||||||
|
UPDATERCPN ?= "${PN}"
|
||||||
|
|
||||||
DEPENDS_append = " update-rc.d-native"
|
DEPENDS_append = " update-rc.d-native"
|
||||||
RDEPENDS_${PN}_append = " update-rc.d"
|
RDEPENDS_${UPDATERCPN}_append = " update-rc.d"
|
||||||
|
|
||||||
INITSCRIPT_PARAMS ?= "defaults"
|
INITSCRIPT_PARAMS ?= "defaults"
|
||||||
|
|
||||||
|
@ -69,7 +71,7 @@ python populate_packages_prepend () {
|
||||||
|
|
||||||
pkgs = bb.data.getVar('INITSCRIPT_PACKAGES', d, 1)
|
pkgs = bb.data.getVar('INITSCRIPT_PACKAGES', d, 1)
|
||||||
if pkgs == None:
|
if pkgs == None:
|
||||||
pkgs = bb.data.getVar('PN', d, 1)
|
pkgs = bb.data.getVar('UPDATERCPN', d, 1)
|
||||||
packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
|
packages = (bb.data.getVar('PACKAGES', d, 1) or "").split()
|
||||||
if not pkgs in packages and packages != []:
|
if not pkgs in packages and packages != []:
|
||||||
pkgs = packages[0]
|
pkgs = packages[0]
|
||||||
|
|
|
@ -10,7 +10,7 @@ SECTION = "libs/gsm"
|
||||||
PROVIDES += "gsmd"
|
PROVIDES += "gsmd"
|
||||||
RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
|
RPROVIDES_${PN} = "libgsmd0 libgsmd gsmd gsmd-devel"
|
||||||
PV = "0.1+svnr${SRCREV}"
|
PV = "0.1+svnr${SRCREV}"
|
||||||
PR = "r0"
|
PR = "r2"
|
||||||
|
|
||||||
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
|
SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
|
||||||
file://fix_machine_init.patch;patch=1 \
|
file://fix_machine_init.patch;patch=1 \
|
||||||
|
@ -19,10 +19,8 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
|
||||||
S = "${WORKDIR}/gsm"
|
S = "${WORKDIR}/gsm"
|
||||||
|
|
||||||
inherit autotools pkgconfig update-rc.d
|
inherit autotools pkgconfig update-rc.d
|
||||||
# handle update-rc.d RDEPENDS manually, we don't need it on
|
|
||||||
# anything but gsmd
|
|
||||||
RDEPENDS_append = ""
|
|
||||||
|
|
||||||
|
UPDATERCPN = "gsmd"
|
||||||
INITSCRIPT_NAME = "gsmd"
|
INITSCRIPT_NAME = "gsmd"
|
||||||
INITSCRIPT_PARAMS = "defaults 35"
|
INITSCRIPT_PARAMS = "defaults 35"
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue