[oe-commits] org.oe.dev libgsmd: remove -w parameter for universal

[pH5 commit]

libgsmd: remove -w parameter for universal

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 814e3aa919de9efa95db7a51931b3b97a98d7aba
ViewMTN: http://monotone.openembedded.org/revision/info/814e3aa919de9efa95db7a51931b3b97a98d7aba
Files:
1
packages/gsm/files/default
packages/gsm/libgsmd_svn.bb
Diffs:

#
# mt diff -r4068182b6a0e1a727a8285f933f441ff0bae278f -r814e3aa919de9efa95db7a51931b3b97a98d7aba
#
# 
# 
# patch "packages/gsm/files/default"
#  from [4f726b64e780ec4724b1d50580aa9d1d0bc585e2]
#    to [4f5482852a023458bb03627f6e4033dc88afaba6]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [9aa39b60aa04ee474e8c277bf9337a9194ce32a7]
#    to [4cba1496c29bd744fd3f2e590315d449dbe0b940]
# 
============================================================
--- packages/gsm/files/default	4f726b64e780ec4724b1d50580aa9d1d0bc585e2
+++ packages/gsm/files/default	4f5482852a023458bb03627f6e4033dc88afaba6
@@ -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"
============================================================
--- packages/gsm/libgsmd_svn.bb	9aa39b60aa04ee474e8c277bf9337a9194ce32a7
+++ packages/gsm/libgsmd_svn.bb	4cba1496c29bd744fd3f2e590315d449dbe0b940
@@ -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 = "r26"
+PR = "r27"
 
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
@@ -12,6 +12,9 @@ inherit autotools pkgconfig update-rc.d
 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-mac
                          gsmd-plugin-vendor-tihtc \
                          "
 
-RDEPENDS_gsmd = "initscripts"
+RDEPENDS_gsmd = "update-rc.d initscripts"
 RRECOMMENDS_gsmd = "gsmd-plugins"
 
 FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*"