Changeset 663

Show
Ignore:
Timestamp:
09/22/06 23:08:35 (2 years ago)
Author:
dnehring
Message:

Sync to HEAD

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • branches/dn-kernel-2.4.33/freewrt/package/Config.in

    r656 r663  
    1717source "package/jffs2root/Config.in" 
    1818source "package/mtd/Config.in" 
     19source "package/broadcom-watchbutton/Config.in" 
    1920source "package/webif/Config.in" 
    2021endmenu 

  • branches/dn-kernel-2.4.33/freewrt/package/Makefile

    r656 r663  
    2323package-$(FWRT_PACKAGE_BRIDGE_UTILS) += bridge-utils 
    2424package-$(FWRT_PACKAGE_BROADCOM_NAS) += broadcom-nas 
     25package-$(FWRT_PACKAGE_BROADCOM_WATCHBUTTON) += broadcom-watchbutton 
    2526package-$(FWRT_PACKAGE_BUSYBOX) += busybox 
    2627package-$(FWRT_PACKAGE_BWM) += bwm 

  • branches/dn-kernel-2.4.33/freewrt/package/atftp/Makefile

    r640 r663  
    5959$(IPKG_ATFTP): 
    6060        $(INSTALL_DIR) $(IDIR_ATFTP)/usr/bin 
    61        $(INSTALL_BIN) $(WRKBUILD)/atftp $(IDIR_ATFTP)/usr/bin 
     61       $(INSTALL_BIN) $(WRKBUILD)/atftp $(IDIR_ATFTP)/usr/bin 
    6262        $(RSTRIP) $(IDIR_ATFTP) 
    6363        $(IPKG_BUILD) $(IDIR_ATFTP) $(PACKAGE_DIR) 
    …… 
    6565$(IPKG_ATFTPD): 
    6666        $(INSTALL_DIR) $(IDIR_ATFTPD)/usr/sbin 
    67        $(INSTALL_BIN) $(WRKBUILD)/atftpd $(IDIR_ATFTPD)/usr/sbin 
     67       $(INSTALL_BIN) $(WRKBUILD)/atftpd $(IDIR_ATFTPD)/usr/sbin 
    6868        $(RSTRIP) $(IDIR_ATFTPD) 
    6969        $(IPKG_BUILD) $(IDIR_ATFTPD) $(PACKAGE_DIR) 

  • branches/dn-kernel-2.4.33/freewrt/package/iptables/Makefile

    r624 r663  
    3535include $(TOPDIR)/mk/package.mk 
    3636include $(LINUX_DIR)/.config 
    37 include $(TOPDIR)/target/linux/netfilter.mk 
     37include $(TOPDIR)/mk/netfilter.mk 
    3838 
    3939$(eval $(call PKG_template,IPTABLES,iptables,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
    …… 
    7272                all install install-devel 
    7373        touch $@ 
    74                  
     74 
    7575$(IPKG_IPTABLES): 
    7676        $(INSTALL_DIR) $(IDIR_IPTABLES)/etc/init.d 

  • branches/dn-kernel-2.4.33/freewrt/package/openvpn/Config.in

    r500 r663  
    5757        default n 
    5858        select FWRT_PACKAGE_OPENSSL_UTIL 
    59         depends on FWRT_PACKAGE_OPENVPN 
     59        depends FWRT_PACKAGE_OPENVPN 
    6060        help 
    6161          collection of shell scripts to manage a simple CA infrastructure 
    …… 
    6767        tristate 
    6868        default n 
    69         depends on FWRT_PACKAGE_OPENVPN 
     69        depends FWRT_PACKAGE_OPENVPN 
    7070        select FWRT_PACKAGE_WEBIF 
    7171 

  • branches/dn-kernel-2.4.33/freewrt/package/webif/files/www/cgi-bin/webif/wan.sh

    r295 r663  
    4444        # umts apn 
    4545        FORM_wwan_service=${wwan_service:-$(nvram get wwan_service)} 
     46        FORM_wwan_auto=${wwan_auto:-$(nvram get wwan_auto)} 
    4647        FORM_wwan_pincode="-@@-" 
    4748        FORM_wwan_country=${wwan_country:-$(nvram get wwan_country)} 
    …… 
    125126                        wwan) 
    126127                                save_setting network wwan_service $FORM_wwan_service 
     128                                save_setting network wwan_auto $FORM_wwan_auto 
    127129                                if ! equal "$FORM_wwan_pincode" "-@@-"; then 
    128130                                        save_setting wwan wwan_pincode $FORM_wwan_pincode 
    …… 
    253255option|umts_only|@TR<<UMTS only>> 
    254256option|gprs_only|@TR<<GPRS only>> 
     257field|@TR<<Start on bootup>> 
     258checkbox|wwan_auto|$FORM_wwan_auto|on 
     259helpitem|Start on  bootup 
     260helptext|if disabled you can start the connection manually by pressing the "3G/UMTS" button 
    255261end_form 
    256262