openmoko-gsmd: Use the shared osmo-service-respawn start script
* The shared script is compatible to the one currently used but it has the benefit of being used by more applications.
This commit is contained in:
parent
1b7bb4ae95
commit
ec29824f84
|
@ -13,7 +13,7 @@ case "$1" in
|
||||||
start)
|
start)
|
||||||
echo -n "Starting cell-log: "
|
echo -n "Starting cell-log: "
|
||||||
start-stop-daemon -S -b -p $PIDFILE \
|
start-stop-daemon -S -b -p $PIDFILE \
|
||||||
-x /etc/gsmd-respawn.sh /usr/bin/cell_log
|
-x /usr/bin/osmo-service-respawn.sh /usr/bin/cell_log
|
||||||
|
|
||||||
if [ $? = 0 ]; then
|
if [ $? = 0 ]; then
|
||||||
echo "cell-log"
|
echo "cell-log"
|
||||||
|
|
|
@ -21,7 +21,7 @@ case "$1" in
|
||||||
|
|
||||||
echo -n "Starting GSM daemon: "
|
echo -n "Starting GSM daemon: "
|
||||||
start-stop-daemon -S -p $PIDFILE -b \
|
start-stop-daemon -S -p $PIDFILE -b \
|
||||||
-x /etc/gsmd-respawn.sh /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -l syslog
|
-x /usr/bin/osmo-service-respawn.sh /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS -l syslog
|
||||||
|
|
||||||
if [ $? = 0 ]; then
|
if [ $? = 0 ]; then
|
||||||
echo "gsmd."
|
echo "gsmd."
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
#!/usr/bin/env bash
|
|
||||||
|
|
||||||
NAME=`basename $1`
|
|
||||||
PIDFILE="/var/run/$NAME.pid"
|
|
||||||
PID=$$
|
|
||||||
echo "$PID" > $PIDFILE
|
|
||||||
echo "-1000" > /proc/$PID/oom_score_adj
|
|
||||||
|
|
||||||
trap "{ rm -f $PIDFILE ; kill 0; }" EXIT
|
|
||||||
|
|
||||||
while true;
|
|
||||||
do
|
|
||||||
echo "Restarting not dealing well with spaces.."
|
|
||||||
(echo "0" > /proc/self/oom_score_adj && exec $*) &
|
|
||||||
LAST_PID=$!
|
|
||||||
wait $LAST_PID
|
|
||||||
sleep 10s
|
|
||||||
done
|
|
||||||
|
|
|
@ -11,12 +11,11 @@ SRC_URI = "git://git.gnumonks.org/openmoko-gsmd.git;branch=master \
|
||||||
file://cell-log.patch \
|
file://cell-log.patch \
|
||||||
file://gsmd \
|
file://gsmd \
|
||||||
file://cell-log \
|
file://cell-log \
|
||||||
file://gsmd-respawn.sh \
|
|
||||||
file://default"
|
file://default"
|
||||||
SRCREV = "da770f8f34662a298647a75698a718705047d3dc"
|
SRCREV = "da770f8f34662a298647a75698a718705047d3dc"
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
PR = "r13.0"
|
PR = "r14.0"
|
||||||
|
|
||||||
inherit autotools pkgconfig update-rc.d
|
inherit autotools pkgconfig update-rc.d
|
||||||
|
|
||||||
|
@ -37,7 +36,6 @@ do_install_append() {
|
||||||
install -m 0755 ${WORKDIR}/cell-log ${D}/${sysconfdir}/init.d/
|
install -m 0755 ${WORKDIR}/cell-log ${D}/${sysconfdir}/init.d/
|
||||||
install -d ${D}/${sysconfdir}/default
|
install -d ${D}/${sysconfdir}/default
|
||||||
install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd
|
install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd
|
||||||
install -m 0755 ${WORKDIR}/gsmd-respawn.sh ${D}/${sysconfdir}/
|
|
||||||
}
|
}
|
||||||
|
|
||||||
PACKAGES =+ "\
|
PACKAGES =+ "\
|
||||||
|
@ -69,8 +67,8 @@ RDEPENDS_${PN}-plugins = "\
|
||||||
${PN}-plugin-vendor-wavecom \
|
${PN}-plugin-vendor-wavecom \
|
||||||
"
|
"
|
||||||
|
|
||||||
RDEPENDS_${PN} += "update-rc.d"
|
RDEPENDS_${PN} += "update-rc.d osmo-service-respawn"
|
||||||
RDEPENDS_${PN}-tools-cell-log += "update-rc.d ${PN}"
|
RDEPENDS_${PN}-tools-cell-log += "update-rc.d ${PN} osmo-service-respawn"
|
||||||
|
|
||||||
FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*"
|
FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*"
|
||||||
FILES_${PN}-tools-cell-log = "${bindir}/cell_log ${sysconfdir}/cell-log"
|
FILES_${PN}-tools-cell-log = "${bindir}/cell_log ${sysconfdir}/cell-log"
|
||||||
|
|
Loading…
Reference in New Issue