Changeset 2796

Show
Ignore:
Timestamp:
06/14/07 15:13:57 (1 year ago)
Author:
tg
Message:

merge base-files-arch into base-files, experimental, blame me if it breaks

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/freewrt/mk/package.mk

    r2685 r2796  
    9898 
    9999_ALL_CONTROLS+= $$(IDIR_$(1))/CONTROL/control 
     100ICONTROL_$(1)?= ipkg/$(2).control 
    100101$$(IDIR_$(1))/CONTROL/control: ${_PATCH_COOKIE} 
    101         ${MBSH} ${SCRIPT_DIR}/make-ipkg-dir.sh $$(IDIR_$(1)) \ 
    102             ./ipkg/$(2).control $(3) $(4) 
     102        ${MBSH} ${SCRIPT_DIR}/make-ipkg-dir.sh $${IDIR_$(1)} $${ICONTROL_$(1)} $(3) $(4) 
    103103        [ -z "$$(IDEPEND_$(1))" ] || echo "Depends: $$(IDEPEND_$(1))" >>$$(IDIR_$(1))/CONTROL/control 
    104104        for file in conffiles preinst postinst prerm postrm; do \ 
  • trunk/freewrt/package/Config.in

    r2795 r2796  
    2020menu "Base system" 
    2121source "package/base-files/Config.in" 
    22 source "package/base-files-arch/Config.in" 
    2322source "package/busybox/Config.in" 
    2423source "package/uclibc/Config.in" 
  • trunk/freewrt/package/Makefile

    r2773 r2796  
    372372 
    373373all: compile 
    374 clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m) base-files base-files-arch
    375 compile: base-files-compile $(COMPILE_PACKAGES) base-files-arch-compile 
    376 install: base-files-install $(INSTALL_PACKAGES) base-files-arch-install 
     374clean: $(patsubst %,%-clean,$(package-) $(package-y) $(package-m) base-files
     375compile: base-files-compile $(COMPILE_PACKAGES) 
     376install: base-files-install $(INSTALL_PACKAGES) 
    377377 
    378378$(COMPILE_PACKAGES): base-files-compile 
  • trunk/freewrt/package/base-files/Makefile

    r2763 r2796  
    99 
    1010PKG_NAME:=              base-files 
    11 PKG_VERSION:=           1.0 
    12 PKG_RELEASE:=           32 
     11PKG_VERSION:=           1.1 
     12PKG_RELEASE:=           1 
    1313WRKDIST=                ${WRKDIR}/base-files 
    1414NO_DISTFILES:=          1 
     15PKG_ID=                 ${BOARD}-${KERNEL}-${DEVICE}-${FS} 
     16WRKDIR=                 ${WRKDIR_BASE}/w-${PKG_NAME}-${PKG_VERSION}-${PKG_RELEASE}-${PKG_ID} 
     17ICONTROL_BASE_FILES=    ipkg/base-files.control 
    1518 
    1619include $(TOPDIR)/mk/package.mk 
    1720 
    18 $(eval $(call PKG_template,BASE_FILES,base-files,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH))) 
     21$(eval $(call PKG_template,BASE_FILES,base-files-${PKG_ID},${PKG_VERSION}-${PKG_RELEASE},${ARCH})) 
    1922 
    2023MD5CRYPT:=              $(shell $(MKPASSWD) $(FWRT_RUNTIME_PASSWORD)) 
     24LAN_SWITCH_PORTS:=      $(strip $(subst ",, $(FWRT_NETWORK_LAN_SWITCH_PORTS))) 
     25WAN_SWITCH_PORTS:=      $(strip $(subst ",, $(FWRT_NETWORK_WAN_SWITCH_PORTS))) 
    2126 
    2227ADMIN_SHELL:=           /bin/sh 
     
    99104        rm -f $(IDIR_BASE_FILES)/var 
    100105        ln -sf /tmp $(IDIR_BASE_FILES)/var 
     106        [ ! -d $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/files ] || \ 
     107            $(CP) $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/files/* $(IDIR_BASE_FILES) 
     108        [ ! -d $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/$(FS)/files ] || \ 
     109            $(CP) $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/$(FS)/files/* $(IDIR_BASE_FILES) 
     110        [ ! -d $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/$(DEVICE)/files ] || \ 
     111            $(CP) $(TOPDIR)/target/linux/$(BOARD)-$(KERNEL)/$(DEVICE)/files/* $(IDIR_BASE_FILES) 
     112        mkdir -p $(IDIR_BASE_FILES)/etc/network 
     113        $(CP) ./netcfg/interfaces $(IDIR_BASE_FILES)/etc/network 
     114ifeq ($(FWRT_NETWORK_LAN),y) 
     115ifeq ($(FWRT_NETWORK_LANBRIDGE),y) 
     116        echo -e "\n# Bridge configuration" >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     117ifeq ($(FWRT_NETWORK_LAN_PROTO_STATIC),y) 
     118        cat ./netcfg/interfaces.bridge.static >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     119        $(SED) "s/@FWRT_LANBRIDGE_ADDRESS@/$(FWRT_NETWORK_LANBRIDGE_IP_ADDRESS)/g" \ 
     120            $(IDIR_BASE_FILES)/etc/network/interfaces 
     121        $(SED) "s/@FWRT_LANBRIDGE_NETMASK@/$(FWRT_NETWORK_LANBRIDGE_IP_NETMASK)/g" \ 
     122            $(IDIR_BASE_FILES)/etc/network/interfaces 
     123else 
     124        cat ./netcfg/interfaces.bridge.dhcp >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     125endif 
     126        $(SED) "s/@FWRT_LANBRIDGE_INTERFACE@/$(FWRT_NETWORK_LANBRIDGE_INTERFACE)/g" \ 
     127            $(IDIR_BASE_FILES)/etc/network/interfaces 
     128        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_LAN_INTERFACE)/" \ 
     129            $(IDIR_BASE_FILES)/etc/network/interfaces 
     130        $(SED) "s/@FWRT_WLAN@/$(FWRT_NETWORK_WLAN_INTERFACE)/" \ 
     131            $(IDIR_BASE_FILES)/etc/network/interfaces 
     132        echo -e "\n# LAN port configuration" >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     133ifeq ($(strip $(FWRT_NETWORK_LAN_SWITCH_PORTS)),) 
     134        cat ./netcfg/interfaces.static | sed "/broadcast/d" | \ 
     135            sed "/^auto/d" >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     136else 
     137        cat ./netcfg/interfaces.static.switch | sed "/broadcast/d" | \ 
     138            sed "/^auto/d" >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     139        $(SED) "s/@FWRT_SWITCH_PORTS@/$(LAN_SWITCH_PORTS)/g" \ 
     140            $(IDIR_BASE_FILES)/etc/network/interfaces 
     141endif 
     142        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_LAN_INTERFACE)/g" \ 
     143            $(IDIR_BASE_FILES)/etc/network/interfaces 
     144        $(SED) "s/@FWRT_ADDRESS@/0.0.0.0/g" \ 
     145            $(IDIR_BASE_FILES)/etc/network/interfaces 
     146        $(SED) "s/@FWRT_NETMASK@/255.255.255.255/g" \ 
     147            $(IDIR_BASE_FILES)/etc/network/interfaces 
     148        $(SED) "s/gateway.*//" \ 
     149            $(IDIR_BASE_FILES)/etc/network/interfaces 
     150else 
     151        echo -e "\n# LAN port configuration" >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     152ifeq ($(FWRT_NETWORK_LAN_PROTO_STATIC),y) 
     153ifeq ($(strip $(FWRT_NETWORK_LAN_SWITCH_PORTS)),) 
     154        cat ./netcfg/interfaces.static >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     155else 
     156        cat ./netcfg/interfaces.static.switch \ 
     157            >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     158        $(SED) "s/@FWRT_SWITCH_PORTS@/$(LAN_SWITCH_PORTS)/g" \ 
     159            $(IDIR_BASE_FILES)/etc/network/interfaces 
     160endif 
     161        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_LAN_INTERFACE)/g" \ 
     162            $(IDIR_BASE_FILES)/etc/network/interfaces 
     163        $(SED) "s/@FWRT_ADDRESS@/$(FWRT_NETWORK_LAN_IP_ADDRESS)/g" \ 
     164            $(IDIR_BASE_FILES)/etc/network/interfaces 
     165        $(SED) "s/@FWRT_NETMASK@/$(FWRT_NETWORK_LAN_IP_NETMASK)/g" \ 
     166            $(IDIR_BASE_FILES)/etc/network/interfaces 
     167        $(SED) "s/gateway.*//" \ 
     168            $(IDIR_BASE_FILES)/etc/network/interfaces 
     169endif 
     170ifeq (FWRT_NETWORK_LAN_PROTO_DHCP),y) 
     171ifeq ($(strip $(FWRT_NETWORK_LAN_SWITCH_PORTS)),) 
     172        cat ./netcfg/interfaces.dhcp >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     173else 
     174        cat ./netcfg/interfaces.dhcp.switch \ 
     175            >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     176        $(SED) "s/@FWRT_SWITCH_PORTS@/$(LAN_SWITCH_PORTS)/g" \ 
     177            $(IDIR_BASE_FILES)/etc/network/interfaces 
     178endif 
     179        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_LAN_INTERFACE)/g" \ 
     180            $(IDIR_BASE_FILES)/etc/network/interfaces 
     181endif 
     182endif 
     183endif 
     184ifeq ($(FWRT_NETWORK_WAN),y) 
     185        echo -e "\n# WAN port configuration" >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     186ifeq ($(FWRT_NETWORK_WAN_PROTO_DHCP),y) 
     187ifeq ($(strip $(FWRT_NETWORK_WAN_SWITCH_PORTS)),) 
     188        cat ./netcfg/interfaces.dhcp >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     189else 
     190        cat ./netcfg/interfaces.dhcp.switch \ 
     191            >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     192        $(SED) "s/@FWRT_SWITCH_PORTS@/$(WAN_SWITCH_PORTS)/g" \ 
     193            $(IDIR_BASE_FILES)/etc/network/interfaces 
     194endif 
     195        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_WAN_INTERFACE)/g" \ 
     196            $(IDIR_BASE_FILES)/etc/network/interfaces 
     197endif 
     198ifeq ($(FWRT_NETWORK_WAN_PROTO_STATIC),y) 
     199ifeq ($(strip $(FWRT_NETWORK_WAN_SWITCH_PORTS)),) 
     200        cat ./netcfg/interfaces.static >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     201else 
     202        cat ./netcfg/interfaces.static.switch \ 
     203            >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     204        $(SED) "s/@FWRT_SWITCH_PORTS@/$(WAN_SWITCH_PORTS)/g" \ 
     205            $(IDIR_BASE_FILES)/etc/network/interfaces 
     206endif 
     207        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_WAN_INTERFACE)/g" \ 
     208            $(IDIR_BASE_FILES)/etc/network/interfaces 
     209        $(SED) "s/@FWRT_ADDRESS@/$(FWRT_NETWORK_WAN_IP_ADDRESS)/g" \ 
     210            $(IDIR_BASE_FILES)/etc/network/interfaces 
     211        $(SED) "s/@FWRT_NETMASK@/$(FWRT_NETWORK_WAN_IP_NETMASK)/g" \ 
     212            $(IDIR_BASE_FILES)/etc/network/interfaces 
     213        $(SED) "s/@FWRT_GATEWAY@/$(FWRT_NETWORK_WAN_IP_GATEWAY)/g" \ 
     214            $(IDIR_BASE_FILES)/etc/network/interfaces 
     215endif 
     216endif 
     217ifeq ($(FWRT_NETWORK_WLAN),y) 
     218        echo -e "\n# WLAN configuration" >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     219ifeq ($(FWRT_NETWORK_LANBRIDGE),y) 
     220        cat ./netcfg/interfaces.wlan | sed "/broadcast/d" | \ 
     221            sed "/^auto/d" >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     222        $(SED) "s/@FWRT_WLAN@/$(FWRT_NETWORK_WLAN_INTERFACE)/g" \ 
     223            $(IDIR_BASE_FILES)/etc/network/interfaces 
     224        $(SED) "s/@FWRT_ADDRESS@/0.0.0.0/g" \ 
     225            $(IDIR_BASE_FILES)/etc/network/interfaces 
     226        $(SED) "s/@FWRT_NETMASK@/255.255.255.255/g" \ 
     227            $(IDIR_BASE_FILES)/etc/network/interfaces 
     228else 
     229        cat ./netcfg/interfaces.wlan \ 
     230            >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     231        $(SED) "s/@FWRT_WLAN@/$(FWRT_NETWORK_WLAN_INTERFACE)/g" \ 
     232            $(IDIR_BASE_FILES)/etc/network/interfaces 
     233        $(SED) "s/@FWRT_ADDRESS@/$(FWRT_NETWORK_WLAN_IP_ADDRESS)/g" \ 
     234            $(IDIR_BASE_FILES)/etc/network/interfaces 
     235        $(SED) "s/@FWRT_NETMASK@/$(FWRT_NETWORK_WLAN_IP_NETMASK)/g" \ 
     236            $(IDIR_BASE_FILES)/etc/network/interfaces 
     237endif 
     238        $(SED) "s/@FWRT_INTERFACE@/$(FWRT_NETWORK_WLAN_INTERFACE)/g" \ 
     239            $(IDIR_BASE_FILES)/etc/network/interfaces 
     240        $(SED) "s/@FWRT_TYPE@/$(FWRT_NETWORK_WLAN_TYPE)/g" \ 
     241            $(IDIR_BASE_FILES)/etc/network/interfaces 
     242        $(SED) "s/@FWRT_COUNTRY@/$(FWRT_NETWORK_WLAN_COUNTRY)/g" \ 
     243            $(IDIR_BASE_FILES)/etc/network/interfaces 
     244        $(SED) "s/@FWRT_SSID@/$(FWRT_NETWORK_WLAN_ESSID)/g" \ 
     245            $(IDIR_BASE_FILES)/etc/network/interfaces 
     246        $(SED) "s/@FWRT_CHANNEL@/$(FWRT_NETWORK_WLAN_CHANNEL)/g" \ 
     247            $(IDIR_BASE_FILES)/etc/network/interfaces 
     248endif 
     249ifeq ($(FWRT_NETWORK_WLAN_MODE_AP), y) 
     250        $(SED) "s/@FWRT_MODE@/ap/g" \ 
     251            $(IDIR_BASE_FILES)/etc/network/interfaces 
     252else ifeq ($(FWRT_NETWORK_WLAN_MODE_STA), y) 
     253        $(SED) "s/@FWRT_CHANNEL@/sta/g" \ 
     254            $(IDIR_BASE_FILES)/etc/network/interfaces 
     255endif 
     256ifeq ($(FWRT_NETWORK_WLAN_SECURITY_NONE), y) 
     257        $(SED) "s/@FWRT_SECURITY@/none/g" \ 
     258            $(IDIR_BASE_FILES)/etc/network/interfaces 
     259else ifeq ($(FWRT_NETWORK_WLAN_SECURITY_WEP), y) 
     260        $(SED) "s/@FWRT_SECURITY@/wep/g" \ 
     261            $(IDIR_BASE_FILES)/etc/network/interfaces 
     262        cat ./netcfg/interfaces.wlan.wep >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     263endif 
     264ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_OPEN), y) 
     265        $(SED) "s/@FWRT_AUTH@/open/g" \ 
     266            $(IDIR_BASE_FILES)/etc/network/interfaces 
     267else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_SHARED), y) 
     268        $(SED) "s/@FWRT_AUTH@/shared/g" \ 
     269            $(IDIR_BASE_FILES)/etc/network/interfaces 
     270else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_OPEN_AND_SHARED), y) 
     271        $(SED) "s/@FWRT_AUTH@/open+shared/g" \ 
     272            $(IDIR_BASE_FILES)/etc/network/interfaces 
     273        $(SED) "s/@FWRT_KEY@/$(FWRT_NETWORK_WLAN_WEP_KEY)/g" \ 
     274            $(IDIR_BASE_FILES)/etc/network/interfaces 
     275else ifeq ($(FWRT_NETWORK_WLAN_SECURITY_WPA_PSK), y) 
     276        $(SED) "s/@FWRT_SECURITY@/wpa-psk/g" \ 
     277            $(IDIR_BASE_FILES)/etc/network/interfaces 
     278        cat ./netcfg/interfaces.wlan.wpa >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     279endif 
     280ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_PSK), y) 
     281        $(SED) "s/@FWRT_AUTH@/psk/g" \ 
     282            $(IDIR_BASE_FILES)/etc/network/interfaces 
     283else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_PSK2), y) 
     284        $(SED) "s/@FWRT_AUTH@/psk2/g" \ 
     285            $(IDIR_BASE_FILES)/etc/network/interfaces 
     286else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_PSK_PSK2), y) 
     287        $(SED) "s/@FWRT_AUTH@/psk psk2/g" \ 
     288            $(IDIR_BASE_FILES)/etc/network/interfaces 
     289endif 
     290ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_TKIP), y) 
     291        $(SED) "s/@FWRT_ENC@/tkip/g" \ 
     292            $(IDIR_BASE_FILES)/etc/network/interfaces 
     293else ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_AES), y) 
     294        $(SED) "s/@FWRT_ENC@/aes/g" \ 
     295            $(IDIR_BASE_FILES)/etc/network/interfaces 
     296else ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_AES_TKIP), y) 
     297        $(SED) "s/@FWRT_ENC@/aes+tkip/g" \ 
     298            $(IDIR_BASE_FILES)/etc/network/interfaces 
     299endif 
     300        $(SED) "s/@FWRT_KEY@/$(FWRT_NETWORK_WLAN_WPA_KEY)/g" \ 
     301            $(IDIR_BASE_FILES)/etc/network/interfaces 
     302        $(SED) "s/@FWRT_REKEY@/$(FWRT_NETWORK_WLAN_WPA_GTK_REKEY)/g" \ 
     303            $(IDIR_BASE_FILES)/etc/network/interfaces 
     304ifeq ($(FWRT_NETWORK_WLAN_SECURITY_802.1X), y) 
     305        $(SED) "s/@FWRT_SECURITY@/8021x/g" \ 
     306            $(IDIR_BASE_FILES)/etc/network/interfaces 
     307        cat ./netcfg/interfaces.wlan.8021x >>$(IDIR_BASE_FILES)/etc/network/interfaces 
     308endif 
     309ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_OPEN), y) 
     310        $(SED) "s/@FWRT_AUTH@/open/g" \ 
     311            $(IDIR_BASE_FILES)/etc/network/interfaces 
     312else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_SHARED), y) 
     313        $(SED) "s/@FWRT_AUTH@/shared/g" \ 
     314            $(IDIR_BASE_FILES)/etc/network/interfaces 
     315else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_WPA), y) 
     316        $(SED) "s/@FWRT_AUTH@/wpa/g" \ 
     317            $(IDIR_BASE_FILES)/etc/network/interfaces 
     318else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_WPA2), y) 
     319        $(SED) "s/@FWRT_AUTH@/wpa2/g" \ 
     320            $(IDIR_BASE_FILES)/etc/network/interfaces 
     321else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_WPA_AND_WPA2), y) 
     322        $(SED) "s/@FWRT_AUTH@/wpa wpa2/g" \ 
     323            $(IDIR_BASE_FILES)/etc/network/interfaces 
     324endif 
     325ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_WEP), y) 
     326        $(SED) "s/@FWRT_ENC@/wep/g" \ 
     327            $(IDIR_BASE_FILES)/etc/network/interfaces 
     328else ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_TKIP), y) 
     329        $(SED) "s/@FWRT_ENC@/tkip/g" \ 
     330            $(IDIR_BASE_FILES)/etc/network/interfaces 
     331else ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_AES), y) 
     332        $(SED) "s/@FWRT_ENC@/aes/g" \ 
     333            $(IDIR_BASE_FILES)/etc/network/interfaces 
     334else ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_AES_TKIP), y) 
     335        $(SED) "s/@FWRT_ENC@/aes+tkip/g" \ 
     336            $(IDIR_BASE_FILES)/etc/network/interfaces 
     337endif 
     338ifeq ($(FWRT_NETWORK_WLAN_EAP_TLS), y) 
     339        $(SED) "s/@FWRT_EAP@/tls/g" \ 
     340            $(IDIR_BASE_FILES)/etc/network/interfaces 
     341else ifeq ($(FWRT_NETWORK_WLAN_EAP_TTLS), y) 
     342        $(SED) "s/@FWRT_EAP@/ttls/g" \ 
     343            $(IDIR_BASE_FILES)/etc/network/interfaces 
     344else ifeq ($(FWRT_NETWORK_WLAN_EAP_PEAP), y) 
     345        $(SED) "s/@FWRT_EAP@/peap/g" \ 
     346            $(IDIR_BASE_FILES)/etc/network/interfaces 
     347else 
     348ifeq ($(FWRT_NETWORK_WLAN_EAP_LEAP), y) 
     349        $(SED) "s/@FWRT_EAP@/LEAP/g" \ 
     350            $(IDIR_BASE_FILES)/etc/network/interfaces 
     351endif 
     352        $(SED) "s/@FWRT_REKEY@/$(FWRT_NETWROK_WLAN_WPA_GTK_REKEY)/g" \ 
     353            $(IDIR_BASE_FILES)/etc/network/interfaces 
     354        $(SED) "s/@FWRT_RADIUS_IP@/$(FWRT_NETWORK_WLAN_RADIUS_IPADDR)/g" \ 
     355            $(IDIR_BASE_FILES)/etc/network/interfaces 
     356        $(SED) "s/@FWRT_RADIUS_PORT@/$(FWRT_NETWORK_WLAN_RADIUS_PORT)/g" \ 
     357            $(IDIR_BASE_FILES)/etc/network/interfaces 
     358        $(SED) "s/@FWRT_RADIUS_KEY@/$(FWRT_NETWORK_WLAN_RADIUS_KEY)/g" \ 
     359            $(IDIR_BASE_FILES)/etc/network/interfaces 
     360endif 
    101361        -find $(IDIR_BASE_FILES) -type d -name CVS | xargs rm -rf 
    102362        -find $(IDIR_BASE_FILES) -type d -name .svn | xargs rm -rf 
    103363        -find $(IDIR_BASE_FILES) -name '.#*' | xargs rm -f 
    104364ifneq (${FWRT_PACKAGE_CONFIG_IN_ETC},) 
    105         gzip -9c ${TOPDIR}/.config > $(IDIR_BASE_FILES)/etc/freewrt.config.gz 
     365        gzip -9c ${TOPDIR}/.config >$(IDIR_BASE_FILES)/etc/freewrt.config.gz 
    106366endif 
    107367 
    108368${_IPKGS_COOKIE}: ${TOPDIR}/package/base-files/.svn/entries 
     369${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_4_BRCM_ASUS_WL500G 
     370${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_4_BRCM_ASUS_WL500G_DELUXE 
     371${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_4_BRCM_ASUS_WL500G_PREMIUM 
     372${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G 
     373${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS 
     374${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54GS_4 
     375${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_4_BRCM_LINKSYS_WRT54G3G 
     376${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_4_BRCM_NETGEAR_WGT634U 
     377${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_6_BRCM_ASUS_WL500G_PREMIUM 
     378${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_6_BRCM_NETGEAR_WGT634U 
     379${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_4_RB_RB532 
     380${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_6_RB_RB532 
     381${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_4_X86_WRAP 
     382${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_6_X86_WRAP 
     383${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_2_6_X86_CRYPTOTOKEN 
     384${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_NOKERNEL_MIPS 
     385${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_LINUX_NOKERNEL_I386 
     386${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_TARGET_ROOTFS_JFFS2 
     387${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_TARGET_ROOTFS_SQUASHFS 
     388${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_TARGET_ROOTFS_NFS 
     389${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_TARGET_ROOTFS_EXT2_CF 
     390${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_TARGET_ROOTFS_YAFFS2 
     391${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_TARGET_ROOTFS_INITRAMFS 
     392${_IPKGS_COOKIE}: ${TOPDIR}/.cfg/FWRT_TARGET_ROOTFS_NONE 
    109393 
    110394include ${TOPDIR}/mk/pkg-bottom.mk 
  • trunk/freewrt/package/base-files/ipkg/base-files.control

    r696 r2796  
    11Package: base-files 
    2 Priority: optional 
    3 Section: net 
    4 Depends: fwcf 
     2Priority: base 
     3Section: base 
    54Description: basic filesystem structure and scripts