Changeset 7d55135 in freewrt


Ignore:
Timestamp:
Feb 3, 2007, 5:05:46 PM (19 years ago)
Author:
Waldemar Brodkorb <wbx@…>
Children:
37e1e07
Parents:
f7878da
Message:
  • add network configuration to ADK, not well tested, but interfaces configuration in trunk is out-of-sync anyway
  • remove redundant code from target/linux/Makefile

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

Files:
8 added
4 edited

Legend:

Unmodified
Added
Removed

  • mk/targets.mk

    rf7878da r7d55135  
    1111DEVICE:=$(3)
    1212endif
     13
     14ifeq ($(FWRT_BUILD_TARGET),y)
     15$(1)/$(2)/$(3)-clean:
     16        @$(TRACE) target/linux/$(2)-$(1)-clean
     17        $(MAKE) -C $(2)-$(1) BOARD="$(2)" DEVICE="$(3)" clean
     18
     19$(1)/$(2)/$(3)-prepare:
     20        @$(TRACE) target/linux/$(2)-$(1)-prepare
     21        $(MAKE) -C $(2)-$(1) BOARD="$(2)" DEVICE="$(3)" prepare
     22
     23$(1)/$(2)/$(3)-compile:
     24        @$(TRACE) target/linux/$(2)-$(1)-compile
     25        $(MAKE) -C $(2)-$(1) BOARD="$(2)" DEVICE="$(3)" compile
     26
     27$(1)/$(2)/$(3)-rebuild:
     28        @$(TRACE) target/linux/$(2)-$(1)-rebuild
     29        $(MAKE) -C $(2)-$(1) BOARD="$(2)" DEVICE="$(3)" rebuild
     30
     31$(1)/$(2)/$(3)-install:
     32        @$(TRACE) target/linux/$(2)-$(1)-install
     33        $(MAKE) -C $(2)-$(1) BOARD="$(2)" DEVICE="$(3)" install
     34
     35ifeq ($(FWRT_LINUX_$(4)),y)
     36clean: $(1)/$(2)/$(3)-clean
     37prepare: $(1)/$(2)/$(3)-prepare
     38compile: $(1)/$(2)/$(3)-compile
     39rebuild: $(1)/$(2)/$(3)-rebuild
     40install: $(1)/$(2)/$(3)-install
     41endif
     42
     43.PHONY: $(1)/$(2)/$(3)-clean $(1)/$(2)/$(3)-prepare \
     44        $(1)/$(2)/$(3)-compile $(1)/$(2)/$(3)-rebuild \
     45        $(1)/$(2)/$(3)-install
     46
     47endif
    1348endef
    1449
     50
    1551# asus models
     52$(eval $(call target_template,2.4,brcm,asus-wl-hdd,2_4_BRCM_ASUS_WLHDD))
    1653$(eval $(call target_template,2.4,brcm,asus-wl500g,2_4_BRCM_ASUS_WL500G))
    1754$(eval $(call target_template,2.4,brcm,asus-wl500g-deluxe,2_4_BRCM_ASUS_WL500G_DELUXE))
    1855$(eval $(call target_template,2.4,brcm,asus-wl500g-premium,2_4_BRCM_ASUS_WL500G_PREMIUM))
    1956# linksys models
    20 $(eval $(call target_template,2.4,brcm,linksys-wrt54gs-10,2_4_BRCM_LINKSYS_WRT54GS_1_0))
    21 $(eval $(call target_template,2.4,brcm,linksys-wrt54gs-11,2_4_BRCM_LINKSYS_WRT54GS_1_1))
    22 $(eval $(call target_template,2.4,brcm,linksys-wrt54gs-4,2_4_BRCM_LINKSYS_WRT54GS_4))
    23 $(eval $(call target_template,2.4,brcm,linksys-wrt54g-10,2_4_BRCM_LINKSYS_WRT54G_1_0))
    24 $(eval $(call target_template,2.4,brcm,linksys-wrt54g-11,2_4_BRCM_LINKSYS_WRT54G_1_1))
    25 $(eval $(call target_template,2.4,brcm,linksys-wrt54g-20,2_4_BRCM_LINKSYS_WRT54G_2_0))
    26 $(eval $(call target_template,2.4,brcm,linksys-wrt54g-22,2_4_BRCM_LINKSYS_WRT54G_2_2))
    27 $(eval $(call target_template,2.4,brcm,linksys-wrt54g-30,2_4_BRCM_LINKSYS_WRT54G_3_0))
    28 $(eval $(call target_template,2.4,brcm,linksys-wrt54g-31,2_4_BRCM_LINKSYS_WRT54G_3_1))
    29 $(eval $(call target_template,2.4,brcm,linksys-wrt54g-4,2_4_BRCM_LINKSYS_WRT54G_4))
    30 $(eval $(call target_template,2.4,brcm,linksys-wrt54gl,2_4_BRCM_LINKSYS_WRT54GL))
     57$(eval $(call target_template,2.4,brcm,linksys-wrt54g-old,2_4_BRCM_LINKSYS_WRT54G_OLD))
     58$(eval $(call target_template,2.4,brcm,linksys-wrt54g,2_4_BRCM_LINKSYS_WRT54G))
     59$(eval $(call target_template,2.4,brcm,linksys-wrt54gs,2_4_BRCM_LINKSYS_WRT54GS))
     60$(eval $(call target_template,2.4,brcm,linksys-wrt54gs4,2_4_BRCM_LINKSYS_WRT54GS4))
    3161$(eval $(call target_template,2.4,brcm,linksys-wrt54g3g,2_4_BRCM_LINKSYS_WRT54G3G))
    3262# netgear models
    … …  
    4575$(eval $(call rootfs_template,jffs2,JFFS2))
    4676$(eval $(call rootfs_template,squashfs-overlay,SQUASHFS_OVERLAY))
    47 $(eval $(call rootfs_template,squashfs-symlinks,SQUASHFS_SYMLINKS))
    4877$(eval $(call rootfs_template,nfs,NFS))
    4978$(eval $(call rootfs_template,ext2-cf,EXT2_CF))

  • package/Config.in

    rf7878da r7d55135  
    367367endmenu
    368368
     369menu "Network Configuration"
     370source "package/Config.in.network"
     371endmenu
     372
    369373menu "Extra stuff"
    370374

  • package/base-files-arch/Makefile

    rf7878da r7d55135  
    1010PKG_NAME:=              base-files-arch
    1111PKG_VERSION:=           1.0
    12 PKG_RELEASE:=           3
     12PKG_RELEASE:=           4
    1313NO_DISTFILES:=          1
    1414
    … …  
    3131        -[ -d $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/$(DEVICE)/files ] && \
    3232                $(CP) $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/$(DEVICE)/files/* $(IDIR_BASE_ARCH)
     33        mkdir -p $(IDIR_BASE_ARCH)/etc/network
     34        $(CP) ./files/interfaces $(IDIR_BASE_ARCH)/etc/network
     35ifeq ($(FWRT_NETWORK_LAN),y)
     36        echo "# LAN port configuration" >> $(IDIR_BASE_ARCH)/etc/network/interfaces
     37ifeq ($(FWRT_NETWORK_LAN_PROTO_STATIC),y)
     38        cat ./files/interfaces.static >> $(IDIR_BASE_ARCH)/etc/network/interfaces
     39        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_LAN_INTERFACE)/g" \
     40                $(IDIR_BASE_ARCH)/etc/network/interfaces
     41ifeq ($(FWRT_NETWORK_LAN_SWITCH_PORTS),)
     42        $(SED) "s/switch.*//" \
     43                $(IDIR_BASE_ARCH)/etc/network/interfaces
     44else
     45        $(SED) "s/@FWRT_SWITCH_PORTS@/$(FWRT_NETWORK_LAN_SWITCH_PORTS)/g" \
     46                $(IDIR_BASE_ARCH)/etc/network/interfaces
     47endif
     48        $(SED) "s/@FWRT_ADDRESS@/$(FWRT_NETWORK_LAN_IP_ADDRESS)/g" \
     49                $(IDIR_BASE_ARCH)/etc/network/interfaces
     50        $(SED) "s/@FWRT_NETMASK@/$(FWRT_NETWORK_LAN_IP_NETMASK)/g" \
     51                $(IDIR_BASE_ARCH)/etc/network/interfaces
     52        $(SED) "s/gateway.*//" \
     53                $(IDIR_BASE_ARCH)/etc/network/interfaces
     54endif
     55ifeq (FWRT_NETWORK_LAN_PROTO_DHCP),y)
     56        cat ./files/interfaces.dhcp >> $(IDIR_BASE_ARCH)/etc/network/interfaces
     57        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_LAN_INTERFACE)/g" \
     58                $(IDIR_BASE_ARCH)/etc/network/interfaces
     59ifeq ($(FWRT_NETWORK_LAN_SWITCH_PORTS),)
     60        $(SED) "s/switch.*//" \
     61                $(IDIR_BASE_ARCH)/etc/network/interfaces
     62else
     63        $(SED) "s/@FWRT_SWITCH_PORTS@/$(FWRT_NETWORK_LAN_SWITCH_PORTS)/g" \
     64                $(IDIR_BASE_ARCH)/etc/network/interfaces
     65endif
     66endif
     67endif
     68ifeq ($(FWRT_NETWORK_WAN),y)
     69ifeq ($(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
     72        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_WAN_INTERFACE)/g" \
     73                $(IDIR_BASE_ARCH)/etc/network/interfaces
     74ifeq ($(FWRT_NETWORK_WAN_SWITCH_PORTS),)
     75        $(SED) "s/switch.*//" \
     76                $(IDIR_BASE_ARCH)/etc/network/interfaces
     77else
     78        $(SED) "s/@FWRT_WAN_SWITCH@/$(FWRT_NETWORK_WAN_SWITCH_PORTS)/g" \
     79                $(IDIR_BASE_ARCH)/etc/network/interfaces
     80endif
     81endif
     82ifeq ($(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
     85        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_WAN_INTERFACE)/g" \
     86                $(IDIR_BASE_ARCH)/etc/network/interfaces
     87ifeq ($(FWRT_NETWORK_WAN_SWITCH_PORTS),)
     88        $(SED) "s/switch.*//" \
     89                $(IDIR_BASE_ARCH)/etc/network/interfaces
     90else
     91        $(SED) "s/@FWRT_WAN_SWITCH@/$(FWRT_NETWORK_WAN_SWITCH_PORTS)/g" \
     92                $(IDIR_BASE_ARCH)/etc/network/interfaces
     93endif
     94        $(SED) "s/@FWRT_ADDRESS@/$(FWRT_NETWORK_WAN_IP_ADDRESS)/g" \
     95                $(IDIR_BASE_ARCH)/etc/network/interfaces
     96        $(SED) "s/@FWRT_NETMASK@/$(FWRT_NETWORK_WAN_IP_NETMASK)/g" \
     97                $(IDIR_BASE_ARCH)/etc/network/interfaces
     98        $(SED) "s/@FWRT_GATEWAY@/$(FWRT_NETWORK_WAN_IP_GATEWAY)/g" \
     99                $(IDIR_BASE_ARCH)/etc/network/interfaces
     100endif
     101endif
    33102        -find $(IDIR_BASE_ARCH) -type d -name CVS | xargs rm -rf
    34103        -find $(IDIR_BASE_ARCH) -type d -name .svn | xargs rm -rf

  • target/linux/Makefile

    rf7878da r7d55135  
    77include $(TOPDIR)/rules.mk
    88
    9 define kernel_template
     9FWRT_BUILD_TARGET=y
    1010
    11 $(1)/$(2)/$(3)-clean:
    12         @$(TRACE) target/linux/$(2)-$(1)-clean
    13         $(MAKE) -C $(2)-$(1) BOARD="$(2)" DEVICE="$(3)" clean
    14 
    15 $(1)/$(2)/$(3)-prepare:
    16         @$(TRACE) target/linux/$(2)-$(1)-prepare
    17         $(MAKE) -C $(2)-$(1) BOARD="$(2)" DEVICE="$(3)" prepare
    18 
    19 $(1)/$(2)/$(3)-compile:
    20         @$(TRACE) target/linux/$(2)-$(1)-compile
    21         $(MAKE) -C $(2)-$(1) BOARD="$(2)" DEVICE="$(3)" compile
    22 
    23 $(1)/$(2)/$(3)-rebuild:
    24         @$(TRACE) target/linux/$(2)-$(1)-rebuild
    25         $(MAKE) -C $(2)-$(1) BOARD="$(2)" DEVICE="$(3)" rebuild
    26 
    27 $(1)/$(2)/$(3)-install:
    28         @$(TRACE) target/linux/$(2)-$(1)-install
    29         $(MAKE) -C $(2)-$(1) BOARD="$(2)" DEVICE="$(3)" install
    30 
    31 ifeq ($(FWRT_LINUX_$(4)),y)
    32 clean: $(1)/$(2)/$(3)-clean
    33 prepare: $(1)/$(2)/$(3)-prepare
    34 compile: $(1)/$(2)/$(3)-compile
    35 rebuild: $(1)/$(2)/$(3)-rebuild
    36 install: $(1)/$(2)/$(3)-install
    37 endif
    38 
    39 .PHONY: $(1)/$(2)/$(3)-clean $(1)/$(2)/$(3)-prepare \
    40         $(1)/$(2)/$(3)-compile $(1)/$(2)/$(3)-rebuild \
    41         $(1)/$(2)/$(3)-install
    42 endef
     11include $(TOPDIR)/mk/targets.mk
    4312
    4413.PHONY: clean prepare compile rebuild install
    … …  
    4918rebuild:
    5019clean:
    51 
    52 # asus models
    53 $(eval $(call kernel_template,2.4,brcm,asus-wl500g,2_4_BRCM_ASUS_WL500G))
    54 $(eval $(call kernel_template,2.4,brcm,asus-wl500g-deluxe,2_4_BRCM_ASUS_WL500G_DELUXE))
    55 $(eval $(call kernel_template,2.4,brcm,asus-wl500g-premium,2_4_BRCM_ASUS_WL500G_PREMIUM))
    56 # linksys models
    57 $(eval $(call kernel_template,2.4,brcm,linksys-wrt54gs-10,2_4_BRCM_LINKSYS_WRT54GS_1_0))
    58 $(eval $(call kernel_template,2.4,brcm,linksys-wrt54gs-11,2_4_BRCM_LINKSYS_WRT54GS_1_1))
    59 $(eval $(call kernel_template,2.4,brcm,linksys-wrt54gs-4,2_4_BRCM_LINKSYS_WRT54GS_4))
    60 $(eval $(call kernel_template,2.4,brcm,linksys-wrt54g-10,2_4_BRCM_LINKSYS_WRT54G_1_0))
    61 $(eval $(call kernel_template,2.4,brcm,linksys-wrt54g-11,2_4_BRCM_LINKSYS_WRT54G_1_1))
    62 $(eval $(call kernel_template,2.4,brcm,linksys-wrt54g-20,2_4_BRCM_LINKSYS_WRT54G_2_0))
    63 $(eval $(call kernel_template,2.4,brcm,linksys-wrt54g-22,2_4_BRCM_LINKSYS_WRT54G_2_2))
    64 $(eval $(call kernel_template,2.4,brcm,linksys-wrt54g-30,2_4_BRCM_LINKSYS_WRT54G_3_0))
    65 $(eval $(call kernel_template,2.4,brcm,linksys-wrt54g-31,2_4_BRCM_LINKSYS_WRT54G_3_1))
    66 $(eval $(call kernel_template,2.4,brcm,linksys-wrt54g-4,2_4_BRCM_LINKSYS_WRT54G_4))
    67 $(eval $(call kernel_template,2.4,brcm,linksys-wrt54gl,2_4_BRCM_LINKSYS_WRT54GL))
    68 $(eval $(call kernel_template,2.4,brcm,linksys-wrt54g3g,2_4_BRCM_LINKSYS_WRT54G3G))
    69 # netgear models
    70 $(eval $(call kernel_template,2.4,brcm,netgear-wgt634u,2_4_BRCM_NETGEAR_WGT634U))
    71 $(eval $(call kernel_template,2.6,brcm,netgear-wgt634u,2_6_BRCM_NETGEAR_WGT634U))
    72 # routerboard models made by mikrotik
    73 $(eval $(call kernel_template,2.4,rb,rb532,2_4_RB_RB532))
    74 $(eval $(call kernel_template,2.6,rb,rb532,2_6_RB_RB532))
    75 
Note: See TracChangeset for help on using the changeset viewer.