[oe-commits] org.oe.dev merge of '93ee90ab50c3c8b253484466785fc6af7584f05a'

[mickeyl commit]

merge of '93ee90ab50c3c8b253484466785fc6af7584f05a'
     and 'c3c391eb3a506332e2baf39f0412a362bf17add8'

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: 0e068d7ae8058c935fe126ba4e70ef29e4d18189
ViewMTN: http://monotone.openembedded.org/revision/info/0e068d7ae8058c935fe126ba4e70ef29e4d18189
Files:
1
packages/gsm/files/fic-gta01
packages/gsm/files/fic-gta01/gsmd
packages/gsm/libgsmd_svn.bb
conf/distro/openmoko.conf
Diffs:

#
# mt diff -r93ee90ab50c3c8b253484466785fc6af7584f05a -r0e068d7ae8058c935fe126ba4e70ef29e4d18189
#
# 
# 
# add_dir "packages/gsm/files/fic-gta01"
# 
# add_file "packages/gsm/files/fic-gta01/gsmd"
#  content [4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [f40a2af6cf0a3f96d564ff62dd07830973d9154a]
#    to [9aa39b60aa04ee474e8c277bf9337a9194ce32a7]
# 
============================================================
--- packages/gsm/files/fic-gta01/gsmd	4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22
+++ packages/gsm/files/fic-gta01/gsmd	4b34b4d0ea3c93fd4db2389a4f1ebd9a7e8c4e22
@@ -0,0 +1,51 @@
+##!/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
+
+PATH=/bin:/usr/bin:/sbin:/usr/sbin
+
+[ -f /etc/default/rcS ] && . /etc/default/rcS
+[ -f /etc/default/gsmd ] && . /etc/default/gsmd
+
+case "$1" in
+    start)
+        stty -F "$GSM_DEV" -crtscts
+        [ -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 &
+
+        if [ $? = 0 ]; then
+            echo "gsmd."
+        else
+            echo "(failed.)"
+        fi
+        ;;
+    stop)
+        [ -n "$GSM_POW" ] && echo "0" >$GSM_POW
+
+        echo -n "Stopping GSM daemon: "
+        start-stop-daemon -K -x /usr/sbin/gsmd
+        stty -F "$GSM_DEV" -crtscts
+        echo "gsmd."
+        ;;
+    restart|force-reload)
+        $0 stop
+        $0 start
+        exit
+        ;;
+    *)
+        echo "Usage: /etc/init.d/apmd {start|stop|restart|force-reload}"
+        exit 1
+        ;;
+esac
+
+exit 0
+
============================================================
--- packages/gsm/libgsmd_svn.bb	f40a2af6cf0a3f96d564ff62dd07830973d9154a
+++ packages/gsm/libgsmd_svn.bb	9aa39b60aa04ee474e8c277bf9337a9194ce32a7
@@ -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 = "r25"
+PR = "r26"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \


#
# mt diff -rc3c391eb3a506332e2baf39f0412a362bf17add8 -r0e068d7ae8058c935fe126ba4e70ef29e4d18189
#
# 
# 
# patch "conf/distro/openmoko.conf"
#  from [c246d427631dbd56b159221956899cc2f40f3b06]
#    to [0a270926afec0c57fe65b21d888d50f318f58085]
# 
============================================================
--- conf/distro/openmoko.conf	c246d427631dbd56b159221956899cc2f40f3b06
+++ conf/distro/openmoko.conf	0a270926afec0c57fe65b21d888d50f318f58085
@@ -35,5 +35,7 @@ require conf/distro/include/preferred-op
 PREFERRED_VERSION_binutils-cross ?= "2.17.50.0.12"
 
 require conf/distro/include/preferred-openmoko-versions.inc
-require conf/distro/include/moko-autorev.inc
 
+# Bleeding-edge developers should add the following line to their local.conf:
+# require conf/distro/include/moko-autorev.inc
+