libgsmd: remove -w parameter for universal

diff --git a/packages/gsm/files/default b/packages/gsm/files/default
index 14c8fc8..0d3eb74 100644 (file)
--- a/packages/gsm/files/default
+++ b/packages/gsm/files/default
@@ -9,7 +9,7 @@ case `cpuinfo_id` in
                GSM_RES="/sys/bus/platform/devices/gta01-pm-gsm.0/reset"
                GSM_DEV="/dev/ttySAC0"
                ;;
-       "HTC Apache"|"HTC Blueangel")
+       "HTC Apache"|"HTC Blueangel"|"HTC Universal")
                GSMD_OPTS="-s 115200 -F"
                GSM_DEV="/dev/ttyS0"
                ;;
@@ -21,10 +21,6 @@ case `cpuinfo_id` in
                GSMD_OPTS="-s 115200 -F"
                GSM_DEV="/dev/ttyS1"
                ;;
-        "HTC Universal")
-               GSMD_OPTS="-s 115200 -F -w 1"
-               GSM_DEV="/dev/ttyS0"
-               ;;
        "Palm Treo 650")
                GSMD_OPTS="-s 460800 -F -w 1"
                GSM_DEV="/dev/ttyS0"

diff --git a/packages/gsm/libgsmd_svn.bb b/packages/gsm/libgsmd_svn.bb
index 50debc0..a3b8f8a 100644 (file)
--- a/packages/gsm/libgsmd_svn.bb
+++ b/packages/gsm/libgsmd_svn.bb
@@ -4,7 +4,7 @@ LICENSE = "GPL LGPL"
 SECTION = "libs/gsm"
 PROVIDES += "gsmd"
 PV = "0.1+svnr${SRCREV}"
-PR = "r26"
+PR = "r27"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
@@ -12,6 +12,9 @@ SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
 S = "${WORKDIR}/gsm"
 
 inherit autotools pkgconfig update-rc.d
+# handle update-rc.d RDEPENDS manually, we don't need it on
+# anything but gsmd
+RDEPENDS_append = ""
 
 INITSCRIPT_NAME = "gsmd"
 INITSCRIPT_PARAMS = "defaults 35"
@@ -44,7 +47,7 @@ RDEPENDS_gsmd-plugins = "gsmd-plugin-machine-generic \
                          gsmd-plugin-vendor-tihtc \
                          "
 
-RDEPENDS_gsmd = "initscripts"
+RDEPENDS_gsmd = "update-rc.d initscripts"
 RRECOMMENDS_gsmd = "gsmd-plugins"
 
 FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*"