[oe-commits] org.oe.dev gsm: Fix default file and init script. GSM_RES was missing, and the tests for null values needed quotes around the value to prevent syntax errors.

[rwhitby commit]

gsm: Fix default file and init script.  GSM_RES was missing, and the tests for null values needed quotes around the value to prevent syntax errors.

Author: rwhitby at nslu2-linux.org
Branch: org.openembedded.dev
Revision: 1cc47f2936bc6346f6e03128eb46345963c599a3
ViewMTN: http://monotone.openembedded.org/revision/info/1cc47f2936bc6346f6e03128eb46345963c599a3
Files:
1
packages/gsm/files/default
packages/gsm/files/gsmd
packages/gsm/libgsmd_svn.bb
Diffs:

#
# mt diff -r60271e29029910207b8512833d049fad50fb282b -r1cc47f2936bc6346f6e03128eb46345963c599a3
#
# 
# 
# patch "packages/gsm/files/default"
#  from [0db3a380100ebc8548f519ca51e460e710593a18]
#    to [d11d3c89b215d54d2e182754e1343c9a2fb716d2]
# 
# patch "packages/gsm/files/gsmd"
#  from [a0900c11652d1a1755019fc170dcdf36658ef086]
#    to [0e44967ffb2d602f531bea0cde6006d337dc4cf8]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [2a8eaeac4025570622a8d2e31183b60094c23103]
#    to [367a54f8a664bfa37b00160037aa16f940344d46]
# 
============================================================
--- packages/gsm/files/default	0db3a380100ebc8548f519ca51e460e710593a18
+++ packages/gsm/files/default	d11d3c89b215d54d2e182754e1343c9a2fb716d2
@@ -6,6 +6,7 @@ case `cpuinfo_id` in
 	"GTA01"|"GTA02")
 		GSMD_OPTS="-s 115200 -F"
 		GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
+		GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset"
 		GSM_DEV="/dev/ttySAC0"
 		;;
 	"HTC Apache"|"HTC Blueangel")
@@ -37,6 +38,9 @@ case `cpuinfo_id` in
 		# 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"
 
+		# If your GSM device then needs to be reset, uncomment and modify the next line
+		#GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset"
+
 		# This should be in a common /etc/default/serial, together with
 		# BT_DEV and IR_DEV for devices that have those on a serial port
 		#GSM_DEV="/dev/ttyS1"
============================================================
--- packages/gsm/files/gsmd	a0900c11652d1a1755019fc170dcdf36658ef086
+++ packages/gsm/files/gsmd	0e44967ffb2d602f531bea0cde6006d337dc4cf8
@@ -13,10 +13,10 @@ case "$1" in
 
 case "$1" in
     start)
-        [ -n $GSM_POW ] && ( echo "0" >$GSM_POW; sleep 1 )
-        [ -n $GSM_POW ] && ( echo "1" >$GSM_POW; sleep 1 )
-        [ -n $GSM_RES ] && ( echo "1" >$GSM_RES; sleep 1 )
-        [ -n $GSM_RES ] && ( echo "0" >$GSM_RES; sleep 2 )
+        [ -n "$GSM_POW" ] && ( echo "0" >$GSM_POW; sleep 1 )
+        [ -n "$GSM_POW" ] && ( echo "1" >$GSM_POW; sleep 1 )
+        [ -n "$GSM_RES" ] && ( echo "1" >$GSM_RES; sleep 1 )
+        [ -n "$GSM_RES" ] && ( echo "0" >$GSM_RES; sleep 2 )
 
         echo -n "Starting GSM daemon: "
         start-stop-daemon -S -x /usr/sbin/gsmd -- gsmd -p $GSM_DEV $GSMD_OPTS >/tmp/gsm.log 2>&1 &
@@ -28,7 +28,7 @@ case "$1" in
         fi
         ;;
     stop)
-        [ -n $GSM_POW ] && echo "0" >$GSM_POW
+        [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
 
         echo -n "Stopping GSM daemon: "
         start-stop-daemon -K -x /usr/sbin/gsmd
============================================================
--- packages/gsm/libgsmd_svn.bb	2a8eaeac4025570622a8d2e31183b60094c23103
+++ packages/gsm/libgsmd_svn.bb	367a54f8a664bfa37b00160037aa16f940344d46
@@ -1,10 +1,10 @@ PV = "0.1+svnr${SRCREV}"
 DESCRIPTION = "GSM libraries and daemons implementing the 07.10 specification"
 HOMEPAGE = "http://www.openmoko.org"
 LICENSE = "GPL LGPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.1+svnr${SRCREV}"
-PR = "r22"
+PR = "r23"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \