[oe-commits] org.oe.dev libgsmd: combine machine specific configuration files, package plugin

[pH5 commit]

libgsmd: combine machine specific configuration files, package plugin 
debugging info - no machine specific (lib)gsmd packages anymore

Author: pH5 at openembedded.org
Branch: org.openembedded.dev
Revision: 52b1e168dedcb5e20f1e063682ea6e64af003ffe
ViewMTN: http://monotone.openembedded.org/revision.psp?id=52b1e168dedcb5e20f1e063682ea6e64af003ffe
Files:
1
packages/gsm/files/fic-gta01
packages/gsm/files/fic-gta01/default
packages/gsm/files/fix-mlbuf.patch
packages/gsm/files/htcuniversal
packages/gsm/files/htcuniversal/default
packages/gsm/files/magician
packages/gsm/files/magician/default
packages/gsm/files/default
packages/gsm/libgsmd_svn.bb
Diffs:

#
# mt diff -r2d9bb3f1e645b23643eaf7cf8ccc4f31c1b84f21 -r52b1e168dedcb5e20f1e063682ea6e64af003ffe
#
# 
# 
# delete "packages/gsm/files/fic-gta01"
# 
# delete "packages/gsm/files/fic-gta01/default"
# 
# delete "packages/gsm/files/fix-mlbuf.patch"
# 
# delete "packages/gsm/files/htcuniversal"
# 
# delete "packages/gsm/files/htcuniversal/default"
# 
# delete "packages/gsm/files/magician"
# 
# delete "packages/gsm/files/magician/default"
# 
# patch "packages/gsm/files/default"
#  from [7ce0e5ef1d869657220f2726615b4248e22cf672]
#    to [f0238ff8fc0e3123941c19055fb0dd74d4fc5ed4]
# 
# patch "packages/gsm/libgsmd_svn.bb"
#  from [18ab9bc749d84c6a0e5c87697ffa494314fde676]
#    to [ff7c3845f7e03d5a5327937e2feb3a7d129fd962]
# 
============================================================
--- packages/gsm/files/default	7ce0e5ef1d869657220f2726615b4248e22cf672
+++ packages/gsm/files/default	f0238ff8fc0e3123941c19055fb0dd74d4fc5ed4
@@ -1,9 +1,44 @@
 # 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"
+. /etc/init.d/functions
 
-# 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"
+case `cpuinfo_id` in
+	"GTA01", "GTA02")
+		GSMD_OPTS="-s 115200 -F"
+		GSM_POW="/sys/bus/platform/devices/gta01-pm-gsm.0/power_on"
+		GSM_DEV="/dev/ttySAC0"
+		;;
+	"HTC Apache", "HTC Blueangel")
+		GSMD_OPTS="-s 115200 -F"
+		GSM_DEV="/dev/ttyS0"
+		;;
+	"HTC Himalaya")
+		GSMD_OPTS="-s 115200 -F"
+		GSM_DEV="/dev/ttyS2"
+		;;
+	"HTC Magician")
+		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"
+		;;
+	*)
+		# Unknown board
 
+		# 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"
+
+		# 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"
+		;;
+esac
-#GSM_DEV="/dev/ttyS1"
============================================================
--- packages/gsm/libgsmd_svn.bb	18ab9bc749d84c6a0e5c87697ffa494314fde676
+++ packages/gsm/libgsmd_svn.bb	ff7c3845f7e03d5a5327937e2feb3a7d129fd962
@@ -6,8 +6,6 @@ PR = "r20"
 PV = "0.1+svn${SRCDATE}"
 PR = "r20"
 
-SRC_URI_OVERRIDES_PACKAGE_ARCH = "1"
-
 SRC_URI = "svn://svn.openmoko.org/trunk/src/target;module=gsm;proto=http \
            file://gsmd \
            file://default"
@@ -31,22 +29,24 @@ PACKAGES =+ "${PN}-tools gsmd gsmd-plugi
 
 PACKAGES =+ "${PN}-tools gsmd gsmd-plugins \
              gsmd-plugin-machine-generic gsmd-plugin-machine-tihtc \
+             gsmd-plugin-vendor-bcm \
              gsmd-plugin-vendor-qc \
-	     gsmd-plugin-vendor-ti \
+             gsmd-plugin-vendor-ti \
              gsmd-plugin-vendor-tihtc \
-	     gsmd-plugin-vendor-bcm \
-	     "
+             "
 
 RDEPENDS_${PN} = "gsmd"
 RDEPENDS_gsmd-plugins = "gsmd-plugin-machine-generic \
                          gsmd-plugin-machine-tihtc \
+                         gsmd-plugin-vendor-bcm \
                          gsmd-plugin-vendor-qc \
                          gsmd-plugin-vendor-ti \
                          gsmd-plugin-vendor-tihtc \
-			 gsmd-plugin-vendor-bcm \
-			 "
+                         "
 
+RDEPENDS_gsmd = "initscripts"
 RRECOMMENDS_gsmd = "gsmd-plugins"
+FILES_${PN}-dbg += "${libdir}/gsmd/.debug/*"
 FILES_${PN}-tools = "${bindir}/*"
 FILES_gsmd = "${sbindir}/gsmd ${sysconfdir}"
 FILES_gsmd-plugins = ""