Changeset 37e1e07 in freewrt


Ignore:
Timestamp:
Feb 3, 2007, 7:00:55 PM (19 years ago)
Author:
Waldemar Brodkorb <wbx@…>
Children:
5ccbb26
Parents:
7d55135
Message:

fix some bugs of new network stuff

git-svn-id: ​svn://www.freewrt.org/trunk/freewrt@1845 afb5a338-a214-0410-bd46-81f09a774fd1

Location:
package
Files:
2 added
4 edited

Legend:

Unmodified
Added
Removed

  • package/Config.in.network

    r7d55135 r37e1e07  
    2525        default "0 1 2 3 5*" if FWRT_LINUX_2_4_BRCM_NETGEAR_WGT634U
    2626        default "1 2 3 4 5*"
    27         depends on FWRT_LINUX_2_4_BRCM_ASUS_WL500G_DELUXE
    28         depends on FWRT_LINUX_2_4_BRCM_ASUS_WL500G_PREMIUM
    29         depends on FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G
    30         depends on FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS
    31         depends on FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS_4
    32         depends on FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G3G
    33         depends on FWRT_LINUX_2_4_BRCM_NETGEAR_WGT634U
     27        depends on FWRT_LINUX_2_4_BRCM_ASUS_WL500G_DELUXE || \
     28                FWRT_LINUX_2_4_BRCM_ASUS_WL500G_PREMIUM || \
     29                FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G || \
     30                FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS || \
     31                FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS_4 || \
     32                FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G3G || \
     33                FWRT_LINUX_2_4_BRCM_NETGEAR_WGT634U
    3434        depends on FWRT_NETWORK_LAN
    3535        help
    … …  
    8585        default "4 5" if FWRT_LINUX_2_4_BRCM_NETGEAR_WGT634U
    8686        default "0 5"
    87         depends on FWRT_LINUX_2_4_BRCM_ASUS_WL500G_DELUXE
    88         depends on FWRT_LINUX_2_4_BRCM_ASUS_WL500G_PREMIUM
    89         depends on FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G
    90         depends on FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS
    91         depends on FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS_4
    92         depends on FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G3G
    93         depends on FWRT_LINUX_2_4_BRCM_NETGEAR_WGT634U
     87        depends on FWRT_LINUX_2_4_BRCM_ASUS_WL500G_DELUXE || \
     88                FWRT_LINUX_2_4_BRCM_ASUS_WL500G_PREMIUM || \
     89                FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G || \
     90                FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS || \
     91                FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS_4 || \
     92                FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G3G || \
     93                FWRT_LINUX_2_4_BRCM_NETGEAR_WGT634U
    9494        depends on FWRT_NETWORK_WAN
    9595        help

  • package/base-files-arch/Makefile

    r7d55135 r37e1e07  
    1616
    1717PKG_ID=                 ${BOARD}-${KERNEL}-${DEVICE}-${FS}
     18LAN_SWITCH_PORTS:=      $(strip $(subst ",, $(FWRT_NETWORK_LAN_SWITCH_PORTS)))
     19WAN_SWITCH_PORTS:=      $(strip $(subst ",, $(FWRT_NETWORK_WAN_SWITCH_PORTS)))
    1820
    1921$(eval $(call PKG_template,BASE_ARCH,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
    … …  
    3638        echo "# LAN port configuration" >> $(IDIR_BASE_ARCH)/etc/network/interfaces
    3739ifeq ($(FWRT_NETWORK_LAN_PROTO_STATIC),y)
     40ifeq ($(strip $(FWRT_NETWORK_LAN_SWITCH_PORTS)),)
    3841        cat ./files/interfaces.static >> $(IDIR_BASE_ARCH)/etc/network/interfaces
     42else
     43        cat ./files/interfaces.static.switch >> \
     44                $(IDIR_BASE_ARCH)/etc/network/interfaces
     45        $(SED) "s/@FWRT_SWITCH_PORTS@/$(LAN_SWITCH_PORTS)/g" \
     46                $(IDIR_BASE_ARCH)/etc/network/interfaces
     47endif
    3948        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_LAN_INTERFACE)/g" \
    4049                $(IDIR_BASE_ARCH)/etc/network/interfaces
    41 ifeq ($(FWRT_NETWORK_LAN_SWITCH_PORTS),)
    42         $(SED) "s/switch.*//" \
    43                 $(IDIR_BASE_ARCH)/etc/network/interfaces
    44 else
    45         $(SED) "s/@FWRT_SWITCH_PORTS@/$(FWRT_NETWORK_LAN_SWITCH_PORTS)/g" \
    46                 $(IDIR_BASE_ARCH)/etc/network/interfaces
    47 endif
    4850        $(SED) "s/@FWRT_ADDRESS@/$(FWRT_NETWORK_LAN_IP_ADDRESS)/g" \
    4951                $(IDIR_BASE_ARCH)/etc/network/interfaces
    … …  
    5456endif
    5557ifeq (FWRT_NETWORK_LAN_PROTO_DHCP),y)
     58ifeq ($(strip $(FWRT_NETWORK_LAN_SWITCH_PORTS)),)
    5659        cat ./files/interfaces.dhcp >> $(IDIR_BASE_ARCH)/etc/network/interfaces
     60else
     61        cat ./files/interfaces.dhcp.switch >> \
     62                $(IDIR_BASE_ARCH)/etc/network/interfaces
     63        $(SED) "s/@FWRT_SWITCH_PORTS@/$(LAN_SWITCH_PORTS)/g" \
     64                $(IDIR_BASE_ARCH)/etc/network/interfaces
     65endif
    5766        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_LAN_INTERFACE)/g" \
    58                 $(IDIR_BASE_ARCH)/etc/network/interfaces
    59 ifeq ($(FWRT_NETWORK_LAN_SWITCH_PORTS),)
    60         $(SED) "s/switch.*//" \
    61                 $(IDIR_BASE_ARCH)/etc/network/interfaces
    62 else
    63         $(SED) "s/@FWRT_SWITCH_PORTS@/$(FWRT_NETWORK_LAN_SWITCH_PORTS)/g" \
    6467                $(IDIR_BASE_ARCH)/etc/network/interfaces
    6568endif
    6669endif
     70ifeq ($(FWRT_NETWORK_WAN),y)
     71        echo "# WAN port configuration" >> $(IDIR_BASE_ARCH)/etc/network/interfaces
     72ifeq ($(FWRT_NETWORK_WAN_PROTO_DHCP),y)
     73ifeq ($(strip $(FWRT_NETWORK_WAN_SWITCH_PORTS)),)
     74        cat ./files/interfaces.dhcp >> $(IDIR_BASE_ARCH)/etc/network/interfaces
     75else
     76        cat ./files/interfaces.dhcp.switch >> \
     77                $(IDIR_BASE_ARCH)/etc/network/interfaces
     78        $(SED) "s/@FWRT_SWITCH_PORTS@/$(WAN_SWITCH_PORTS)/g" \
     79                $(IDIR_BASE_ARCH)/etc/network/interfaces
    6780endif
    68 ifeq ($(FWRT_NETWORK_WAN),y)
    69 ifeq ($(FWRT_NETWORK_WAN_PROTO_DHCP),y)
    70         echo "# WAN port configuration" >> $(IDIR_BASE_ARCH)/etc/network/interfaces
    71         cat ./files/interfaces.dhcp >> $(IDIR_BASE_ARCH)/etc/network/interfaces
    7281        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_WAN_INTERFACE)/g" \
    7382                $(IDIR_BASE_ARCH)/etc/network/interfaces
    74 ifeq ($(FWRT_NETWORK_WAN_SWITCH_PORTS),)
    75         $(SED) "s/switch.*//" \
     83endif
     84ifeq ($(FWRT_NETWORK_WAN_PROTO_STATIC),y)
     85ifeq ($(strip $(FWRT_NETWORK_WAN_SWITCH_PORTS)),)
     86        cat ./files/interfaces.static >> $(IDIR_BASE_ARCH)/etc/network/interfaces
     87else
     88        cat ./files/interfaces.static.switch >> \
    7689                $(IDIR_BASE_ARCH)/etc/network/interfaces
    77 else
    78         $(SED) "s/@FWRT_WAN_SWITCH@/$(FWRT_NETWORK_WAN_SWITCH_PORTS)/g" \
     90        $(SED) "s/@FWRT_SWITCH_PORTS@/$(WAN_SWITCH_PORTS)/g" \
    7991                $(IDIR_BASE_ARCH)/etc/network/interfaces
    8092endif
    81 endif
    82 ifeq ($(FWRT_NETWORK_WAN_PROTO_STATIC),y)
    83         echo "# WAN port configuration" >> $(IDIR_BASE_ARCH)/etc/network/interfaces
    84         cat ./files/interfaces.static >> $(IDIR_BASE_ARCH)/etc/network/interfaces
    8593        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_WAN_INTERFACE)/g" \
    8694                $(IDIR_BASE_ARCH)/etc/network/interfaces
    87 ifeq ($(FWRT_NETWORK_WAN_SWITCH_PORTS),)
    88         $(SED) "s/switch.*//" \
    89                 $(IDIR_BASE_ARCH)/etc/network/interfaces
    90 else
    91         $(SED) "s/@FWRT_WAN_SWITCH@/$(FWRT_NETWORK_WAN_SWITCH_PORTS)/g" \
    92                 $(IDIR_BASE_ARCH)/etc/network/interfaces
    93 endif
    9495        $(SED) "s/@FWRT_ADDRESS@/$(FWRT_NETWORK_WAN_IP_ADDRESS)/g" \
    9596                $(IDIR_BASE_ARCH)/etc/network/interfaces

  • package/base-files-arch/files/interfaces.dhcp

    r7d55135 r37e1e07  
    11auto @FWRT_INTERFACE@
    22iface @FWRT_INTERFACE@ inet dhcp
    3         switch-ports @FWRT_SWITCH_PORTS@

  • package/base-files-arch/files/interfaces.static

    r7d55135 r37e1e07  
    44        netmask @FWRT_NETMASK@
    55        gateway @FWRT_GATEWAY@
    6         switch-ports @FWRT_SWITCH_PORTS@
Note: See TracChangeset for help on using the changeset viewer.