[oe-commits] org.oe.dev libgsmd: gsmd init script updates

[pH5 commit]

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

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 5af140b58c366d08abd2b54ab2841ebc30096bb7
ViewMTN: http://monotone.openembedded.org/revision.psp?id=5af140b58c366d08abd2b54ab2841ebc30096bb7
Files:
1
packages/gsm/files/fic-gta01/gsmd
packages/gsm/files/gsmd
packages/gsm/files/magician
packages/gsm/files/fic-gta01/default
packages/gsm/files/magician/default
packages/gsm/libgsmd_svn.bb
Diffs:

#
# mt diff -r219a3642744e875bcfc3f6d808e54c900730ab97 -r5af140b58c366d08abd2b54ab2841ebc30096bb7
#
# 
# 
# rename "packages/gsm/files/fic-gta01/gsmd"
#     to "packages/gsm/files/gsmd"
# 
# add_dir "packages/gsm/files/magician"
# 
# add_file "packages/gsm/files/fic-gta01/default"
#  content [88792bd88d1916b371812642001be9c4bcc3da66]
# 
# add_file "packages/gsm/files/magician/default"
#  content [a35ed7b8d5a6950f4463d130608f1f841b4b639a]
# 
# patch "packages/gsm/files/gsmd"
#  from [82f08cc0dffff0c4798dc04712a1a6cce89195ca]
#    to [a0a905b0ddd5eec14184f034531c84712eb7be84]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [eb7e056ea07094894c13b07b63444e5cb0357b80]
#    to [11f10fe27d6e79355d45b072796f293019e90ff8]
# 
============================================================
--- packages/gsm/files/fic-gta01/default	88792bd88d1916b371812642001be9c4bcc3da66
+++ packages/gsm/files/fic-gta01/default	88792bd88d1916b371812642001be9c4bcc3da66
@@ -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"
============================================================
--- packages/gsm/files/magician/default	a35ed7b8d5a6950f4463d130608f1f841b4b639a
+++ packages/gsm/files/magician/default	a35ed7b8d5a6950f4463d130608f1f841b4b639a
@@ -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"
============================================================
--- packages/gsm/files/fic-gta01/gsmd	82f08cc0dffff0c4798dc04712a1a6cce89195ca
+++ packages/gsm/files/gsmd	a0a905b0ddd5eec14184f034531c84712eb7be84
@@ -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
============================================================
--- packages/gsm/libgsmd_svn.bb	eb7e056ea07094894c13b07b63444e5cb0357b80
+++ packages/gsm/libgsmd_svn.bb	11f10fe27d6e79355d45b072796f293019e90ff8
@@ -7,7 +7,8 @@ SRC_URI = "svn://svn.openmoko.org/trunk/
 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_install_append() {
 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"