From: Florian Fainelli Date: Mon, 24 Jul 2006 17:10:28 +0000 (+0000) Subject: Move gcom to comgt to reflect the site disclaimer X-Git-Tag: whiterussian_rc6~195 X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=48822c1b7a2bccd02817931cedbdc62b88a07120;p=openwrt%2Fsvn-archive%2Fopenwrt.git Move gcom to comgt to reflect the site disclaimer SVN-Revision: 4263 --- diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in index cf999987cd..018adffa5d 100644 --- a/openwrt/package/Config.in +++ b/openwrt/package/Config.in @@ -130,7 +130,7 @@ source "package/picocom/Config.in" source "package/setserial/Config.in" comment "Utilities ---" -source "package/gcom/Config.in" +source "package/comgt/Config.in" source "package/madwifi-tools/Config.in" source "package/pciutils/Config.in" source "package/pcmcia-cs/Config.in" # pcmcia-utils diff --git a/openwrt/package/comgt/Config.in b/openwrt/package/comgt/Config.in new file mode 100644 index 0000000000..971f9ecd84 --- /dev/null +++ b/openwrt/package/comgt/Config.in @@ -0,0 +1,10 @@ +config BR2_PACKAGE_GCOM + tristate "gcom - Option/Vodafone 3G/GPRS control tool" + default m + help + Option GlobeTrotter GPRS/EDGE/3G/HSDPA and Vodafone 3G/GPRS datacard control tool + + gcom is a scripting language interpreter useful for establishing communications + on serial lines and through PCMCIA modems as well as GPRS and 3G datacards. + + http://www.pharscape.org/content/view/46/70/ diff --git a/openwrt/package/comgt/Makefile b/openwrt/package/comgt/Makefile new file mode 100644 index 0000000000..fae5df9b54 --- /dev/null +++ b/openwrt/package/comgt/Makefile @@ -0,0 +1,41 @@ +# $Id$ + +include $(TOPDIR)/rules.mk + +PKG_NAME:=comgt +PKG_VERSION:=0.3 +PKG_RELEASE:=1 +PKG_MD5SUM:=70701fbed89df09826f73283e72c6a51 + +PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/ +PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz +PKG_CAT:=zcat + +PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) +PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install + +include $(TOPDIR)/package/rules.mk + +$(eval $(call PKG_template,COMGT,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) + +$(PKG_BUILD_DIR)/.configured: + touch $@ + +$(PKG_BUILD_DIR)/.built: + $(MAKE) -C $(PKG_BUILD_DIR) \ + CC="$(TARGET_CC)" \ + CFLAGS="$(TARGET_CFLAGS)" \ + gcom + touch $@ + +$(IPKG_COMGT): + install -d -m0755 $(IDIR_COMGT)/usr/bin + install -m0755 $(PKG_BUILD_DIR)/gcom $(IDIR_COMGT)/usr/bin/ + install -d -m0755 $(IDIR_COMGT)/etc/gcom + install -m0644 ./files/setpin.gcom $(IDIR_COMGT)/etc/gcom/setpin.gcom + install -m0644 ./files/setmode.gcom $(IDIR_COMGT)/etc/gcom/setmode.gcom + install -m0644 ./files/getcardinfo.gcom $(IDIR_COMGT)/etc/gcom/getcardinfo.gcom + install -m0644 ./files/getstrength.gcom $(IDIR_COMGT)/etc/gcom/getstrength.gcom + $(RSTRIP) $(IDIR_COMGT) + $(IPKG_BUILD) $(IDIR_COMGT) $(PACKAGE_DIR) + diff --git a/openwrt/package/comgt/files/getcardinfo.gcom b/openwrt/package/comgt/files/getcardinfo.gcom new file mode 100644 index 0000000000..5c69a64604 --- /dev/null +++ b/openwrt/package/comgt/files/getcardinfo.gcom @@ -0,0 +1,14 @@ +opengt + set com 115200n81 + set comecho off + set senddelay 0.02 + waitquiet 0.2 0.2 + flash 0.1 + +:start + send "ATI^m" + get 1 "" $s + print $s + +:continue + exit 0 diff --git a/openwrt/package/comgt/files/getstrength.gcom b/openwrt/package/comgt/files/getstrength.gcom new file mode 100644 index 0000000000..2886285971 --- /dev/null +++ b/openwrt/package/comgt/files/getstrength.gcom @@ -0,0 +1,14 @@ +opengt + set com 115200n81 + set comecho off + set senddelay 0.02 + waitquiet 0.2 0.2 + flash 0.1 + +:start + send "AT+CSQ^m" + get 1 "" $s + print $s + +:continue + exit 0 diff --git a/openwrt/package/comgt/files/setmode.gcom b/openwrt/package/comgt/files/setmode.gcom new file mode 100644 index 0000000000..4ce0b5fa78 --- /dev/null +++ b/openwrt/package/comgt/files/setmode.gcom @@ -0,0 +1,26 @@ +# set wwan mode from environment +opengt + set com 115200n81 + set senddelay 0.02 + waitquiet 1 0.2 + flash 0.1 + +:start + print "Trying to set mode\n" + send $env("MODE") + send "^m" + + waitfor 15 "OK","ERR","ERROR" + if % = 0 goto continue + if % = 1 goto modeerror + if % = 2 goto modeerror + + print "Timeout setting WWAN mode!\n" + exit 1 + +:modeerror + print "Error setting WWAN mode!\n" + exit 1 + +:continue + exit 0 diff --git a/openwrt/package/comgt/files/setpin.gcom b/openwrt/package/comgt/files/setpin.gcom new file mode 100644 index 0000000000..66350fe20b --- /dev/null +++ b/openwrt/package/comgt/files/setpin.gcom @@ -0,0 +1,55 @@ +# set pin code from evnironment "$PINCODE" +opengt + set com 115200n81 + set senddelay 0.05 + waitquiet 3 0.5 + flash 0.1 + + let c=0 +:start + send "AT+CPIN?^m" + waitfor 15 "SIM PUK","SIM PIN","READY","ERROR","ERR" + if % = -1 goto timeout + if % = 0 goto ready + if % = 1 goto setpin + if % = 2 goto ready + if % = 3 goto checkrepeat + if % = 4 goto checkrepeat + +:checkrepeat + inc c + if c>3 goto pinerror + waitquiet 12 0.5 + goto start + +:timeout + print "timeout checking for PIN." + exit 1 + +:ready + print "SIM ready\n" + goto continue + exit 0 + +:setpin + # check if output was "SIM PIN2", that's ok. + waitfor 1 "2" + if % = 0 goto ready + + print "Trying to set PIN\n" + send "AT+CPIN=\"" + send $env("PINCODE") + send "\"^m" + + waitfor 20 "OK","ERR" + if % = -1 goto pinerror + if % = 0 goto continue + if % = 1 goto pinerror + +:pinerror + print "Error setting PIN, check card manually\n" + exit 1 + +:continue + print "PIN set successfully\n" + exit 0 diff --git a/openwrt/package/comgt/ipkg/gcom.control b/openwrt/package/comgt/ipkg/gcom.control new file mode 100644 index 0000000000..a51d7ebcc4 --- /dev/null +++ b/openwrt/package/comgt/ipkg/gcom.control @@ -0,0 +1,4 @@ +Package: gcom +Priority: optional +Section: console +Description: Option GlobeTrotter GPRS/EDGE/3G/HSDPA and Vodafone 3G/GPRS datacard control tool diff --git a/openwrt/package/comgt/patches/001-Makefile.patch b/openwrt/package/comgt/patches/001-Makefile.patch new file mode 100644 index 0000000000..bf0bb52eec --- /dev/null +++ b/openwrt/package/comgt/patches/001-Makefile.patch @@ -0,0 +1,32 @@ +--- gcom-0.3/Makefile 2006-01-04 16:05:28.000000000 +0100 ++++ gcom-0.3.new/Makefile 2006-07-11 15:09:50.000000000 +0200 +@@ -20,8 +20,6 @@ + # + # $Id$ + # +-LIB = -L/usr/local/lib +-INC = -I/usr/local/include + EXE = /usr/local/bin + MAN = /usr/share/man/man1 + CPROG = gcom +@@ -29,9 +27,6 @@ + BIN = $(CPROG) $(SCRIPT) + MANP = gcom.1 sigmon.1 + +-CFLAGS = -c +-LDFLAGS = +- + all: $(BIN) + + install: +@@ -53,8 +48,8 @@ + + + gcom: gcom.o +- cc gcom.o $(LDFLAGS) -o gcom ++ $(CC) gcom.o $(LDFLAGS) -o gcom + + gcom.o: gcom.c gcom.h +- cc gcom.c $(CFLAGS) ++ $(CC) -c $(CFLAGS) gcom.c + diff --git a/openwrt/package/gcom/Config.in b/openwrt/package/gcom/Config.in deleted file mode 100644 index 971f9ecd84..0000000000 --- a/openwrt/package/gcom/Config.in +++ /dev/null @@ -1,10 +0,0 @@ -config BR2_PACKAGE_GCOM - tristate "gcom - Option/Vodafone 3G/GPRS control tool" - default m - help - Option GlobeTrotter GPRS/EDGE/3G/HSDPA and Vodafone 3G/GPRS datacard control tool - - gcom is a scripting language interpreter useful for establishing communications - on serial lines and through PCMCIA modems as well as GPRS and 3G datacards. - - http://www.pharscape.org/content/view/46/70/ diff --git a/openwrt/package/gcom/Makefile b/openwrt/package/gcom/Makefile deleted file mode 100644 index 688b8cd809..0000000000 --- a/openwrt/package/gcom/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# $Id$ - -include $(TOPDIR)/rules.mk - -PKG_NAME:=gcom -PKG_VERSION:=0.3 -PKG_RELEASE:=1 -PKG_MD5SUM:=f9bc8fde70278f1e990c705ccf2ae700 - -PKG_SOURCE_URL:=http://downloads.openwrt.org/sources/ -PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tgz -PKG_CAT:=zcat - -PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION) -PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install - -include $(TOPDIR)/package/rules.mk - -$(eval $(call PKG_template,GCOM,$(PKG_NAME),$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) - -$(PKG_BUILD_DIR)/.configured: - touch $@ - -$(PKG_BUILD_DIR)/.built: - $(MAKE) -C $(PKG_BUILD_DIR) \ - CC="$(TARGET_CC)" \ - CFLAGS="$(TARGET_CFLAGS)" \ - gcom - touch $@ - -$(IPKG_GCOM): - install -d -m0755 $(IDIR_GCOM)/usr/bin - install -m0755 $(PKG_BUILD_DIR)/gcom $(IDIR_GCOM)/usr/bin/ - install -d -m0755 $(IDIR_GCOM)/etc/gcom - install -m0644 ./files/setpin.gcom $(IDIR_GCOM)/etc/gcom/setpin.gcom - install -m0644 ./files/setmode.gcom $(IDIR_GCOM)/etc/gcom/setmode.gcom - install -m0644 ./files/getcardinfo.gcom $(IDIR_GCOM)/etc/gcom/getcardinfo.gcom - install -m0644 ./files/getstrength.gcom $(IDIR_GCOM)/etc/gcom/getstrength.gcom - $(RSTRIP) $(IDIR_GCOM) - $(IPKG_BUILD) $(IDIR_GCOM) $(PACKAGE_DIR) - diff --git a/openwrt/package/gcom/files/getcardinfo.gcom b/openwrt/package/gcom/files/getcardinfo.gcom deleted file mode 100644 index 5c69a64604..0000000000 --- a/openwrt/package/gcom/files/getcardinfo.gcom +++ /dev/null @@ -1,14 +0,0 @@ -opengt - set com 115200n81 - set comecho off - set senddelay 0.02 - waitquiet 0.2 0.2 - flash 0.1 - -:start - send "ATI^m" - get 1 "" $s - print $s - -:continue - exit 0 diff --git a/openwrt/package/gcom/files/getstrength.gcom b/openwrt/package/gcom/files/getstrength.gcom deleted file mode 100644 index 2886285971..0000000000 --- a/openwrt/package/gcom/files/getstrength.gcom +++ /dev/null @@ -1,14 +0,0 @@ -opengt - set com 115200n81 - set comecho off - set senddelay 0.02 - waitquiet 0.2 0.2 - flash 0.1 - -:start - send "AT+CSQ^m" - get 1 "" $s - print $s - -:continue - exit 0 diff --git a/openwrt/package/gcom/files/setmode.gcom b/openwrt/package/gcom/files/setmode.gcom deleted file mode 100644 index 4ce0b5fa78..0000000000 --- a/openwrt/package/gcom/files/setmode.gcom +++ /dev/null @@ -1,26 +0,0 @@ -# set wwan mode from environment -opengt - set com 115200n81 - set senddelay 0.02 - waitquiet 1 0.2 - flash 0.1 - -:start - print "Trying to set mode\n" - send $env("MODE") - send "^m" - - waitfor 15 "OK","ERR","ERROR" - if % = 0 goto continue - if % = 1 goto modeerror - if % = 2 goto modeerror - - print "Timeout setting WWAN mode!\n" - exit 1 - -:modeerror - print "Error setting WWAN mode!\n" - exit 1 - -:continue - exit 0 diff --git a/openwrt/package/gcom/files/setpin.gcom b/openwrt/package/gcom/files/setpin.gcom deleted file mode 100644 index 66350fe20b..0000000000 --- a/openwrt/package/gcom/files/setpin.gcom +++ /dev/null @@ -1,55 +0,0 @@ -# set pin code from evnironment "$PINCODE" -opengt - set com 115200n81 - set senddelay 0.05 - waitquiet 3 0.5 - flash 0.1 - - let c=0 -:start - send "AT+CPIN?^m" - waitfor 15 "SIM PUK","SIM PIN","READY","ERROR","ERR" - if % = -1 goto timeout - if % = 0 goto ready - if % = 1 goto setpin - if % = 2 goto ready - if % = 3 goto checkrepeat - if % = 4 goto checkrepeat - -:checkrepeat - inc c - if c>3 goto pinerror - waitquiet 12 0.5 - goto start - -:timeout - print "timeout checking for PIN." - exit 1 - -:ready - print "SIM ready\n" - goto continue - exit 0 - -:setpin - # check if output was "SIM PIN2", that's ok. - waitfor 1 "2" - if % = 0 goto ready - - print "Trying to set PIN\n" - send "AT+CPIN=\"" - send $env("PINCODE") - send "\"^m" - - waitfor 20 "OK","ERR" - if % = -1 goto pinerror - if % = 0 goto continue - if % = 1 goto pinerror - -:pinerror - print "Error setting PIN, check card manually\n" - exit 1 - -:continue - print "PIN set successfully\n" - exit 0 diff --git a/openwrt/package/gcom/ipkg/gcom.control b/openwrt/package/gcom/ipkg/gcom.control deleted file mode 100644 index a51d7ebcc4..0000000000 --- a/openwrt/package/gcom/ipkg/gcom.control +++ /dev/null @@ -1,4 +0,0 @@ -Package: gcom -Priority: optional -Section: console -Description: Option GlobeTrotter GPRS/EDGE/3G/HSDPA and Vodafone 3G/GPRS datacard control tool diff --git a/openwrt/package/gcom/patches/001-Makefile.patch b/openwrt/package/gcom/patches/001-Makefile.patch deleted file mode 100644 index bf0bb52eec..0000000000 --- a/openwrt/package/gcom/patches/001-Makefile.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- gcom-0.3/Makefile 2006-01-04 16:05:28.000000000 +0100 -+++ gcom-0.3.new/Makefile 2006-07-11 15:09:50.000000000 +0200 -@@ -20,8 +20,6 @@ - # - # $Id$ - # --LIB = -L/usr/local/lib --INC = -I/usr/local/include - EXE = /usr/local/bin - MAN = /usr/share/man/man1 - CPROG = gcom -@@ -29,9 +27,6 @@ - BIN = $(CPROG) $(SCRIPT) - MANP = gcom.1 sigmon.1 - --CFLAGS = -c --LDFLAGS = -- - all: $(BIN) - - install: -@@ -53,8 +48,8 @@ - - - gcom: gcom.o -- cc gcom.o $(LDFLAGS) -o gcom -+ $(CC) gcom.o $(LDFLAGS) -o gcom - - gcom.o: gcom.c gcom.h -- cc gcom.c $(CFLAGS) -+ $(CC) -c $(CFLAGS) gcom.c -