From 3aea1c400ca4298e347ab5d49658a01e537bc311 Mon Sep 17 00:00:00 2001 From: Philipp Zabel Date: Mon, 19 Mar 2007 20:26:01 +0000 Subject: libgsmd: gsmd init script updates - split out machine configuration into /etc/default/gsmd - add machine configuration for magician - remove uucp/spool handling, it is not needed for gsmd --- packages/gsm/files/fic-gta01/default | 9 +++ packages/gsm/files/fic-gta01/gsmd | 109 ----------------------------- packages/gsm/files/gsmd | 103 +++++++++++++++++++++++++++ packages/gsm/files/magician/.mtn2git_empty | 0 packages/gsm/files/magician/default | 9 +++ packages/gsm/libgsmd_svn.bb | 5 +- 6 files changed, 125 insertions(+), 110 deletions(-) create mode 100644 packages/gsm/files/fic-gta01/default delete mode 100644 packages/gsm/files/fic-gta01/gsmd create mode 100644 packages/gsm/files/gsmd create mode 100644 packages/gsm/files/magician/.mtn2git_empty create mode 100644 packages/gsm/files/magician/default (limited to 'packages/gsm') diff --git a/packages/gsm/files/fic-gta01/default b/packages/gsm/files/fic-gta01/default new file mode 100644 index 0000000000..1511376a6c --- /dev/null +++ b/packages/gsm/files/fic-gta01/default @@ -0,0 +1,9 @@ +# gsmd This shell script configures for the gsmd init script. + +# If you must specify special options, uncomment and modify the next line +GSMD_OPTS="-s 115200 -F" + +# If your GSM device needs to be powered up, uncomment and modify the next line +GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" + +GSM_DEV="/dev/ttySAC0" diff --git a/packages/gsm/files/fic-gta01/gsmd b/packages/gsm/files/fic-gta01/gsmd deleted file mode 100644 index 822abf57ca..0000000000 --- a/packages/gsm/files/fic-gta01/gsmd +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/sh -# -# gsmd This shell script starts and stops gsmd. -# -# chkconfig: 345 90 40 -# description: Gsmd manages access to a serial- or USB-connected GSM -# processname: gsmd - -# If you must specify special options, uncomment and modify the next line -GSMD_OPTS="-s 115200 -F" -# If your GSM device needs to be powered up, uncommend and modify the next line -GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" -GSM_DEV="/dev/ttySAC0" - -# Source function library. -#. /etc/rc.d/init.d/functions - -RETVAL=0 -prog="gsmd" - -start() { - # FIXME add check whether GSM_POW is set at all, otherwise don't try to power on - # Power on GSM device - if [ -e "${GSM_POW}" ] - then - echo -n "Powering up GSM device..." - echo "1" > ${GSM_POW} - sleep 1 - echo "done" - else - echo "GSM device not found. Aborting startup" - return false - fi - # Start daemons. - echo -n "Starting $prog: " - # We don't use the daemon function here because of a known bug - # in initlog -- it spuriously returns a nonzero status when - # starting daemons that fork themselves. See - # http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=130629 - # for discussion. Fortunately: - # - # 1. gsmd startup can't fail, or at least not in the absence of - # much larger resource-exhaustion problems that would be very obvious. - # - # 2. We don't need all the logging crud that daemon/initlog sets - # up -- gsmd does its own syslog calls. - # - if [ -e "${GSM_DEV}" ] - then - chown uucp.uucp ${GSM_DEV} - mkdir -p /usr/spool/uucp - chown uucp.uucp /usr/spool/uucp - stty -F /dev/ttySAC0 crtscts - gsmd -p ${GSM_DEV} ${GSMD_OPTS} >/tmp/gsm.log 2>&1 & - echo "success" - else - # User needs to symlink ${GPS_DEV} to the right thing - echo "No ${GSM_DEV} device, aborting gsmd startup." - fi - RETVAL=$? - echo - [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gsmd - return $RETVAL -} - -stop() { - # Stop daemons. - echo -n "Shutting down $prog: " - killall gsmd -# killproc gsmd - RETVAL=$? - echo - if [ $RETVAL -eq 0 ] - then - rm -f /var/lock/subsys/gsmd; - fi - return $RETVAL -} - -# See how we were called. -case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - start - RETVAL=$? - ;; - condrestart) - if [ -f /var/lock/subsys/gsmd ]; then - stop - start - RETVAL=$? - fi - ;; - status) -# status gsmd -# RETVAL=$? - ;; - *) - echo "Usage: $0 {start|stop|restart|condrestart|status}" - exit 1 -esac - -exit $RETVAL diff --git a/packages/gsm/files/gsmd b/packages/gsm/files/gsmd new file mode 100644 index 0000000000..26ff56aa5c --- /dev/null +++ b/packages/gsm/files/gsmd @@ -0,0 +1,103 @@ +#!/bin/sh +# +# gsmd This shell script starts and stops gsmd. +# +# chkconfig: 345 90 40 +# description: Gsmd manages access to a serial- or USB-connected GSM +# processname: gsmd + +# Source configuration +. /etc/default/gsmd + +# Source function library. +#. /etc/rc.d/init.d/functions + +RETVAL=0 +prog="gsmd" + +start() { + # FIXME add check whether GSM_POW is set at all, otherwise don't try to power on + # Power on GSM device + if [ -e "${GSM_POW}" ] + then + echo -n "Powering up GSM device..." + echo "1" > ${GSM_POW} + sleep 1 + echo "done" + else + echo "GSM device not found. Aborting startup" + return false + fi + # Start daemons. + echo -n "Starting $prog: " + # We don't use the daemon function here because of a known bug + # in initlog -- it spuriously returns a nonzero status when + # starting daemons that fork themselves. See + # http://bugzilla.redhat.com/bugzilla/show_bug.cgi?id=130629 + # for discussion. Fortunately: + # + # 1. gsmd startup can't fail, or at least not in the absence of + # much larger resource-exhaustion problems that would be very obvious. + # + # 2. We don't need all the logging crud that daemon/initlog sets + # up -- gsmd does its own syslog calls. + # + if [ -e "${GSM_DEV}" ] + then + stty -F ${GSM_DEV} crtscts + gsmd -p ${GSM_DEV} ${GSMD_OPTS} >/tmp/gsm.log 2>&1 & + echo "success" + else + # User needs to symlink ${GPS_DEV} to the right thing + echo "No ${GSM_DEV} device, aborting gsmd startup." + fi + RETVAL=$? + echo + [ $RETVAL -eq 0 ] && touch /var/lock/subsys/gsmd + return $RETVAL +} + +stop() { + # Stop daemons. + echo -n "Shutting down $prog: " + killall gsmd +# killproc gsmd + RETVAL=$? + echo + if [ $RETVAL -eq 0 ] + then + rm -f /var/lock/subsys/gsmd; + fi + return $RETVAL +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + RETVAL=$? + ;; + condrestart) + if [ -f /var/lock/subsys/gsmd ]; then + stop + start + RETVAL=$? + fi + ;; + status) +# status gsmd +# RETVAL=$? + ;; + *) + echo "Usage: $0 {start|stop|restart|condrestart|status}" + exit 1 +esac + +exit $RETVAL diff --git a/packages/gsm/files/magician/.mtn2git_empty b/packages/gsm/files/magician/.mtn2git_empty new file mode 100644 index 0000000000..e69de29bb2 diff --git a/packages/gsm/files/magician/default b/packages/gsm/files/magician/default new file mode 100644 index 0000000000..fb19d46fd5 --- /dev/null +++ b/packages/gsm/files/magician/default @@ -0,0 +1,9 @@ +# gsmd This shell script configures for the gsmd init script. + +# If you must specify special options, uncomment and modify the next line +GSMD_OPTS="-s 115200 -F" + +# If your GSM device needs to be powered up, uncomment and modify the next line +#GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on" + +GSM_DEV="/dev/ttyS1" diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb index 79623f1897..720ba55d76 100644 --- a/packages/gsm/libgsmd_svn.bb +++ b/packages/gsm/libgsmd_svn.bb @@ -7,7 +7,8 @@ PV = "0.0+svn${SRCDATE}" PR = "r6" SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \ - file://gsmd" + file://gsmd \ + file://default" S = "${WORKDIR}/gsm" inherit autotools pkgconfig update-rc.d @@ -22,6 +23,8 @@ do_stage() { do_install_append() { install -d ${D}/${sysconfdir}/init.d install -m 0755 ${WORKDIR}/gsmd ${D}/${sysconfdir}/init.d/ + install -d ${D}/${sysconfdir}/default + install ${WORKDIR}/default ${D}/${sysconfdir}/default/gsmd } PACKAGES =+ "${PN}-tools gsmd" -- cgit v1.2.3