Changeset f623f76 in freewrt

Timestamp:

Sep 22, 2006, 11:08:35 PM (19 years ago)

Author:

Dirk Nehring <dnehring@…>

Children:

b9df045

Parents:

71e2dd2

Message:

Sync to HEAD

git-svn-id: ​svn://www.freewrt.org/branches/dn-kernel-2.4.33@663 afb5a338-a214-0410-bd46-81f09a774fd1

Location:

package

Files:

• Config.in (modified) (1 diff)
• Makefile (modified) (1 diff)
• atftp/Makefile (modified) (2 diffs)
• broadcom-watchbutton/Config.in (added)
• broadcom-watchbutton/Makefile (added)
• broadcom-watchbutton/files/button.sh (added)
• broadcom-watchbutton/ipkg/broadcom-watchbutton.control (added)
• broadcom-watchbutton/watchbutton.c (added)
• broadcom-watchbutton/watchbutton.init (added)
• iptables/Makefile (modified) (2 diffs)
• openvpn/Config.in (modified) (2 diffs)
• webif/files/www/cgi-bin/webif/wan.sh (modified) (3 diffs)

package/Config.in

@@ -17 +17 @@
 source "package/jffs2root/Config.in"
 source "package/mtd/Config.in"
+source "package/broadcom-watchbutton/Config.in"
 source "package/webif/Config.in"
 endmenu

package/Makefile

@@ -23 +23 @@
 package-$(FWRT_PACKAGE_BRIDGE_UTILS) += bridge-utils
 package-$(FWRT_PACKAGE_BROADCOM_NAS) += broadcom-nas
+package-$(FWRT_PACKAGE_BROADCOM_WATCHBUTTON) += broadcom-watchbutton
 package-$(FWRT_PACKAGE_BUSYBOX) += busybox
 package-$(FWRT_PACKAGE_BWM) += bwm

package/atftp/Makefile

@@ -59 +59 @@
 $(IPKG_ATFTP):
         $(INSTALL_DIR) $(IDIR_ATFTP)/usr/bin
-       $(INSTALL_BIN) $(WRKBUILD)/atftp $(IDIR_ATFTP)/usr/bin
+        $(INSTALL_BIN) $(WRKBUILD)/atftp $(IDIR_ATFTP)/usr/bin
         $(RSTRIP) $(IDIR_ATFTP)
         $(IPKG_BUILD) $(IDIR_ATFTP) $(PACKAGE_DIR)
@@ -65 +65 @@
 $(IPKG_ATFTPD):
         $(INSTALL_DIR) $(IDIR_ATFTPD)/usr/sbin
-       $(INSTALL_BIN) $(WRKBUILD)/atftpd $(IDIR_ATFTPD)/usr/sbin
+        $(INSTALL_BIN) $(WRKBUILD)/atftpd $(IDIR_ATFTPD)/usr/sbin
         $(RSTRIP) $(IDIR_ATFTPD)
         $(IPKG_BUILD) $(IDIR_ATFTPD) $(PACKAGE_DIR)

package/iptables/Makefile

@@ -35 +35 @@
 include $(TOPDIR)/mk/package.mk
 include $(LINUX_DIR)/.config
-include $(TOPDIR)/target/linux/netfilter.mk
+include $(TOPDIR)/mk/netfilter.mk
 
 $(eval $(call PKG_template,IPTABLES,iptables,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
@@ -72 +72 @@
                 all install install-devel
         touch $@
-                
+
 $(IPKG_IPTABLES):
         $(INSTALL_DIR) $(IDIR_IPTABLES)/etc/init.d

package/openvpn/Config.in

@@ -57 +57 @@
         default n
         select FWRT_PACKAGE_OPENSSL_UTIL
-        depends on FWRT_PACKAGE_OPENVPN
+        depends FWRT_PACKAGE_OPENVPN
         help
           collection of shell scripts to manage a simple CA infrastructure
@@ -67 +67 @@
         tristate
         default n
-        depends on FWRT_PACKAGE_OPENVPN
+        depends FWRT_PACKAGE_OPENVPN
         select FWRT_PACKAGE_WEBIF
 

package/webif/files/www/cgi-bin/webif/wan.sh

@@ -44 +44 @@
         # umts apn
         FORM_wwan_service=${wwan_service:-$(nvram get wwan_service)}
+        FORM_wwan_auto=${wwan_auto:-$(nvram get wwan_auto)}
         FORM_wwan_pincode="-@@-"
         FORM_wwan_country=${wwan_country:-$(nvram get wwan_country)}
@@ -125 +126 @@
                         wwan)
                                 save_setting network wwan_service $FORM_wwan_service
+                                save_setting network wwan_auto $FORM_wwan_auto
                                 if ! equal "$FORM_wwan_pincode" "-@@-"; then
                                         save_setting wwan wwan_pincode $FORM_wwan_pincode
@@ -253 +255 @@
 option|umts_only|@TR<<UMTS only>>
 option|gprs_only|@TR<<GPRS only>>
+field|@TR<<Start on bootup>>
+checkbox|wwan_auto|$FORM_wwan_auto|on
+helpitem|Start on  bootup
+helptext|if disabled you can start the connection manually by pressing the "3G/UMTS" button
 end_form