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

5 files changed, 25 insertions, 10 deletions

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/gsmd
index 822abf57ca..26ff56aa5c 100644
--- a/packages/gsm/files/fic-gta01/gsmd
+++ b/packages/gsm/files/gsmd
@@ -6,11 +6,8 @@
 # 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 configuration
+. /etc/default/gsmd
 
 # Source function library.
 #. /etc/rc.d/init.d/functions
@@ -47,10 +44,7 @@ start() {
 	#
 	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
+		stty -F ${GSM_DEV} crtscts
 		gsmd -p ${GSM_DEV} ${GSMD_OPTS} >/tmp/gsm.log 2>&1 &
 		echo "success"
 	else
diff --git a/packages/gsm/files/magician/.mtn2git_empty b/packages/gsm/files/magician/.mtn2git_empty
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/packages/gsm/files/magician/.mtn2git_empty
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"