Changeset 2cba1e1 in freewrt


Ignore:
Timestamp:
Mar 20, 2007, 1:52:56 PM (19 years ago)
Author:
Thorsten Glaser <tg@…>
Children:
d273ea5
Parents:
a61158e
Message:
  • no reason to use gmake 3.80 compatible cruft now XXX someone please double-check base-files-arch/Makefile
  • whitespace cleanup *sigh*

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

Files:
6 edited

Legend:

Unmodified
Added
Removed

  • mk/buildhlp.mk

    ra61158e r2cba1e1  
    5757
    5858__use_generic_patch_target:=42
    59 else
    60 ifeq ($(strip ${NO_DISTFILES}),1)
     59else ifeq ($(strip ${NO_DISTFILES}),1)
    6160${WRKDIST}/.extract_done:
    6261        rm -rf ${WRKDIST} ${WRKSRC} ${WRKBUILD}
    … …  
    6968
    7069__use_generic_patch_target:=42
    71 else
    72 ifeq ($(strip ${_IN_PACKAGE}),1)
     70else ifeq ($(strip ${_IN_PACKAGE}),1)
    7371$(warning This package does not use the generic extraction and patch target; it's most likely to fail.)
    74 endif
    75 endif
    7672endif
    7773

  • mk/kernel-build.mk

    ra61158e r2cba1e1  
    125125
    126126
    127 prepare: 
     127prepare:
    128128        -mkdir -p $(PACKAGE_DIR)
    129129
    … …  
    150150        rm -rf $(LINUX_BUILD_DIR)
    151151        rm -f $(TARGETS)
    152 

  • mk/modules.mk

    ra61158e r2cba1e1  
    102102
    103103ifeq ($(KERNEL),2.6)
    104 SCHED_CLS_MODULES = net/sched/cls_basic 
    105 else
    106 SCHED_CLS_MODULES = 
     104SCHED_CLS_MODULES = net/sched/cls_basic
     105else
     106SCHED_CLS_MODULES =
    107107endif
    108108SCHED_CLS_MODULES += net/sched/cls_fw
    … …  
    196196IP6TABLES_MODULES += net/ipv6/netfilter/ip6t_eui64
    197197IP6TABLES_MODULES += net/ipv6/netfilter/ip6t_LOG
    198 IP6TABLES_MODULES += net/ipv6/netfilter/ip6t_owner 
     198IP6TABLES_MODULES += net/ipv6/netfilter/ip6t_owner
    199199$(eval $(call KMOD_template,IP6TABLES,ip6tables,\
    200200        $(foreach mod,$(IP6TABLES_MODULES),$(MODULES_DIR)/kernel/$(mod)) \
    … …  
    663663        $(MODULES_DIR)/kernel/lib/crc-ccitt \
    664664,CONFIG_CRC_CCITT,,20))
    665 

  • mk/pkg-bottom.mk

    ra61158e r2cba1e1  
    5252            ${CONFIGURE_ARGS}
    5353
    54 else
    55 ifeq ($(filter-out manual,${CONFIGURE_STYLE}),)
     54else ifeq ($(filter-out manual,${CONFIGURE_STYLE}),)
    5655        ${MAKE} do-configure
    5756else
    5857        @echo "Invalid CONFIGURE_STYLE '${CONFIGURE_STYLE}'" >&2
    5958        @exit 1
    60 endif
    6159endif
    6260        @${MAKE} post-configure
    … …  
    9088        cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
    9189            ${MAKE_FLAGS} ${ALL_TARGET}
    92 else
    93 ifeq ($(filter-out manual,${BUILD_STYLE}),)
     90else ifeq ($(filter-out manual,${BUILD_STYLE}),)
    9491        ${MAKE} do-build
    9592else
    9693        @echo "Invalid BUILD_STYLE '${BUILD_STYLE}'" >&2
    9794        @exit 1
    98 endif
    9995endif
    10096        @${MAKE} post-build
    … …  
    112108        cd ${WRKBUILD} && env ${MAKE_ENV} ${MAKE} -f ${MAKE_FILE} \
    113109            DESTDIR='${WRKINST}' ${FAKE_FLAGS} ${INSTALL_TARGET}
    114 else
    115 ifeq ($(filter-out manual,${INSTALL_STYLE}),)
     110else ifeq ($(filter-out manual,${INSTALL_STYLE}),)
    116111        ${MAKE} do-install
    117112else
    118113        @echo "Invalid INSTALL_STYLE '${INSTALL_STYLE}'" >&2
    119114        @exit 1
    120 endif
    121115endif
    122116        @${MAKE} post-install

  • package/base-files-arch/Makefile

    ra61158e r2cba1e1  
    126126        $(SED) "s/@FWRT_MODE@/ap/g" \
    127127                $(IDIR_BASE_ARCH)/etc/network/interfaces
    128 else
    129 ifeq ($(FWRT_NETWORK_WLAN_MODE_STA), y)
     128else ifeq ($(FWRT_NETWORK_WLAN_MODE_STA), y)
    130129        $(SED) "s/@FWRT_CHANNEL@/sta/g" \
    131130                $(IDIR_BASE_ARCH)/etc/network/interfaces
    132 endif
    133131endif
    134132
    … …  
    136134        $(SED) "s/@FWRT_SECURITY@/none/g" \
    137135                $(IDIR_BASE_ARCH)/etc/network/interfaces
    138 else
    139 ifeq ($(FWRT_NETWORK_WLAN_SECURITY_WEP), y)
     136else ifeq ($(FWRT_NETWORK_WLAN_SECURITY_WEP), y)
    140137        $(SED) "s/@FWRT_SECURITY@/wep/g" \
    141138                $(IDIR_BASE_ARCH)/etc/network/interfaces
    142139
    143140        cat ./files/interfaces.wlan.wep >> $(IDIR_BASE_ARCH)/etc/network/interfaces
    144 endif
    145141endif
    146142
    … …  
    148144        $(SED) "s/@FWRT_AUTH@/open/g" \
    149145                $(IDIR_BASE_ARCH)/etc/network/interfaces
    150 else
    151 ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_SHARED), y)
     146else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_SHARED), y)
    152147        $(SED) "s/@FWRT_AUTH@/shared/g" \
    153148                $(IDIR_BASE_ARCH)/etc/network/interfaces
    154 else
    155 ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_OPEN_AND_SHARED), y)
     149else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_OPEN_AND_SHARED), y)
    156150        $(SED) "s/@FWRT_AUTH@/open+shared/g" \
    157151                $(IDIR_BASE_ARCH)/etc/network/interfaces
    … …  
    159153        $(SED) "s/@FWRT_KEY@/$(FWRT_NETWORK_WLAN_WEP_KEY)/g" \
    160154                $(IDIR_BASE_ARCH)/etc/network/interfaces
    161 else
    162 ifeq ($(FWRT_NETWORK_WLAN_SECURITY_WPA_PSK), y)
     155else ifeq ($(FWRT_NETWORK_WLAN_SECURITY_WPA_PSK), y)
    163156        $(SED) "s/@FWRT_SECURITY@/wpa-psk/g" \
    164157                $(IDIR_BASE_ARCH)/etc/network/interfaces
    165158
    166159         cat ./files/interfaces.wlan.wpa >> $(IDIR_BASE_ARCH)/etc/network/interfaces
    167 endif
    168 endif
    169 endif
    170160endif
    171161
    … …  
    173163        $(SED) "s/@FWRT_AUTH@/psk/g" \
    174164                $(IDIR_BASE_ARCH)/etc/network/interfaces
    175 else
    176 ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_PSK2), y)
     165else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_PSK2), y)
    177166        $(SED) "s/@FWRT_AUTH@/psk2/g" \
    178167                $(IDIR_BASE_ARCH)/etc/network/interfaces
    179 else
    180 ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_PSK_PSK2), y)
     168else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_PSK_PSK2), y)
    181169        $(SED) "s/@FWRT_AUTH@/psk psk2/g" \
    182170                $(IDIR_BASE_ARCH)/etc/network/interfaces
    183 endif
    184 endif
    185171endif
    186172
    … …  
    188174        $(SED) "s/@FWRT_ENC@/tkip/g" \
    189175                $(IDIR_BASE_ARCH)/etc/network/interfaces
    190 else
    191 ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_AES), y)
     176else ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_AES), y)
    192177        $(SED) "s/@FWRT_ENC@/aes/g" \
    193178                $(IDIR_BASE_ARCH)/etc/network/interfaces
    194 else
    195 ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_AES_TKIP), y)
     179else ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_AES_TKIP), y)
    196180        $(SED) "s/@FWRT_ENC@/aes+tkip/g" \
    197181                $(IDIR_BASE_ARCH)/etc/network/interfaces
    198 endif
    199 endif
    200182endif
    201183
    … …  
    217199        $(SED) "s/@FWRT_AUTH@/open/g" \
    218200                $(IDIR_BASE_ARCH)/etc/network/interfaces
    219 else
    220 ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_SHARED), y)
     201else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_SHARED), y)
    221202        $(SED) "s/@FWRT_AUTH@/shared/g" \
    222203                $(IDIR_BASE_ARCH)/etc/network/interfaces
    223 else
    224 ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_WPA), y)
     204else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_WPA), y)
    225205        $(SED) "s/@FWRT_AUTH@/wpa/g" \
    226206                $(IDIR_BASE_ARCH)/etc/network/interfaces
    227 else
    228 ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_WPA2), y)
     207else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_WPA2), y)
    229208        $(SED) "s/@FWRT_AUTH@/wpa2/g" \
    230209                $(IDIR_BASE_ARCH)/etc/network/interfaces
    231 else
    232 ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_WPA_AND_WPA2), y)
     210else ifeq ($(FWRT_NETWORK_WLAN_AUTORIZATION_WPA_AND_WPA2), y)
    233211        $(SED) "s/@FWRT_AUTH@/wpa wpa2/g" \
    234212                $(IDIR_BASE_ARCH)/etc/network/interfaces
    235 endif
    236 endif
    237 endif
    238 endif
    239213endif
    240214
    … …  
    242216        $(SED) "s/@FWRT_ENC@/wep/g" \
    243217                $(IDIR_BASE_ARCH)/etc/network/interfaces
    244 else
    245 ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_TKIP), y)
     218else ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_TKIP), y)
    246219        $(SED) "s/@FWRT_ENC@/tkip/g" \
    247220                $(IDIR_BASE_ARCH)/etc/network/interfaces
    248 else
    249 ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_AES), y)
     221else ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_AES), y)
    250222        $(SED) "s/@FWRT_ENC@/aes/g" \
    251223                $(IDIR_BASE_ARCH)/etc/network/interfaces
    252 else
    253 ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_AES_TKIP), y)
     224else ifeq ($(FWRT_NETWORK_WLAN_ENCRYPTION_AES_TKIP), y)
    254225        $(SED) "s/@FWRT_ENC@/aes+tkip/g" \
    255226                $(IDIR_BASE_ARCH)/etc/network/interfaces
    256 endif
    257 endif
    258 endif
    259227endif
    260228
    … …  
    263231        $(SED) "s/@FWRT_EAP@/tls/g" \
    264232                $(IDIR_BASE_ARCH)/etc/network/interfaces
    265 else
    266 ifeq ($(FWRT_NETWORK_WLAN_EAP_TTLS), y)
     233else ifeq ($(FWRT_NETWORK_WLAN_EAP_TTLS), y)
    267234        $(SED) "s/@FWRT_EAP@/ttls/g" \
    268235                $(IDIR_BASE_ARCH)/etc/network/interfaces
    269 else
    270 ifeq ($(FWRT_NETWORK_WLAN_EAP_PEAP), y)
     236else ifeq ($(FWRT_NETWORK_WLAN_EAP_PEAP), y)
    271237        $(SED) "s/@FWRT_EAP@/peap/g" \
    272238                $(IDIR_BASE_ARCH)/etc/network/interfaces
    … …  
    286252        $(SED) "s/@FWRT_RADIUS_KEY@/$(FWRT_NETWORK_WLAN_RADIUS_KEY)/g" \
    287253                $(IDIR_BASE_ARCH)/etc/network/interfaces
    288 endif
    289 endif
    290254endif
    291255

  • rules.mk

    ra61158e r2cba1e1  
    7575ifeq ($(strip ${FWRT_LINUX_2_4_BRCM}),y)
    7676UNAME_R:=               2.4.34
    77 else
    78 ifeq ($(strip ${FWRT_LINUX_2_6_BRCM}),y)
     77else ifeq ($(strip ${FWRT_LINUX_2_6_BRCM}),y)
    7978UNAME_R:=               2.6.19.1
    80 else
    81 ifeq ($(strip ${FWRT_LINUX_2_4_RB}),y)
     79else ifeq ($(strip ${FWRT_LINUX_2_4_RB}),y)
    8280UNAME_R:=               2.4.34
    83 else
    84 ifeq ($(strip ${FWRT_LINUX_2_6_RB}),y)
     81else ifeq ($(strip ${FWRT_LINUX_2_6_RB}),y)
    8582UNAME_R:=               2.6.19.1
    86 else
    87 ifeq ($(strip ${FWRT_LINUX_2_6_X86}),y)
     83else ifeq ($(strip ${FWRT_LINUX_2_6_X86}),y)
    8884UNAME_R:=               2.6.19.1
    8985else
    9086$(error Cannot determine target "uname -r" output)
    9187endif
    92 endif
    93 endif
    94 endif
    95 endif
    9688
    9789ifeq ($(strip ${FWRT_mipsel}),y)
    9890UNAME_M:=               mips
    99 else
    100 ifeq ($(strip ${FWRT_i386}),y)
     91else ifeq ($(strip ${FWRT_i386}),y)
    10192UNAME_M:=               i386
    10293else
    10394$(error Cannot determine target "uname -m" output)
    104 endif
    10595endif
    10696
Note: See TracChangeset for help on using the changeset viewer.