Changeset 20188


Ignore:
Timestamp:
2010-03-14T02:53:41+01:00 (6 years ago)
Author:
thepeople
Message:

this patch fixes iptables parallel build.

-Raphael

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/package/iptables/Makefile

    r19917 r20188  
    11# 
    2 # Copyright (C) 2006-2009 OpenWrt.org 
     2# Copyright (C) 2006-2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
     
    1111PKG_NAME:=iptables 
    1212PKG_VERSION:=1.4.6 
    13 PKG_RELEASE:=1 
     13PKG_RELEASE:=2 
    1414 
    1515PKG_MD5SUM:=c67cf30e281a924def6426be0973df56 
     
    2020        ftp://ftp.no.netfilter.org/pub/netfilter/iptables/ 
    2121 
    22 PKG_FIXUP = libtool 
     22PKG_FIXUP:=libtool 
    2323 
    2424include $(INCLUDE_DIR)/package.mk 
     
    4949 
    5050define Package/iptables/description 
    51  IPv4 firewall administration tool. 
    52  Includes support for: 
    53  - comment 
    54  - limit 
    55  - LOG 
    56  - mac 
    57  - multiport 
    58  - REJECT 
    59  - TCPMSS 
     51IPv4 firewall administration tool. 
     52Includes support for: 
     53- comment 
     54- limit 
     55- LOG 
     56- mac 
     57- multiport 
     58- REJECT 
     59- TCPMSS 
    6060endef 
    6161 
     
    6666 
    6767define Package/iptables-mod-conntrack/description 
    68  Basic iptables extensions for connection tracking. 
    69  Includes: 
    70  - state 
    71  - raw 
    72  - NOTRACK  
     68Basic iptables extensions for connection tracking. 
     69Includes: 
     70- state 
     71- raw 
     72- NOTRACK 
    7373endef 
    7474 
     
    7979 
    8080define Package/iptables-mod-conntrack-extra/description 
    81  Extra iptables extensions for connection tracking. 
    82  Includes: 
    83  - libipt_conntrack 
    84  - libipt_helper 
    85  - libipt_connmark/CONNMARK 
     81Extra iptables extensions for connection tracking. 
     82Includes: 
     83- libipt_conntrack 
     84- libipt_helper 
     85- libipt_connmark/CONNMARK 
    8686endef 
    8787 
     
    9292 
    9393define Package/iptables-mod-filter/description 
    94  iptables extensions for packet content inspection. 
    95  Includes: 
    96  - libipt_string 
    97  - libipt_layer7 
     94iptables extensions for packet content inspection. 
     95Includes: 
     96- libipt_string 
     97- libipt_layer7 
    9898endef 
    9999 
     
    104104 
    105105define Package/iptables-mod-imq/description 
    106  iptables extension for IMQ support. 
    107  Includes: 
    108  - libipt_IMQ 
     106iptables extension for IMQ support. 
     107Includes: 
     108- libipt_IMQ 
    109109endef 
    110110 
     
    115115 
    116116define Package/iptables-mod-ipopt/description 
    117  iptables extensions for matching/changing IP packet options. 
    118  Includes: 
    119  - libipt_CLASSIFY 
    120  - libipt_dscp/DSCP 
    121  - libipt_ecn/ECN 
    122  - libipt_length 
    123  - libipt_mac 
    124  - libipt_mark/MARK 
    125  - libipt_statistic 
    126  - libipt_tcpmms 
    127  - libipt_tos/TOS 
    128  - libipt_ttl/TTL 
    129  - libipt_unclean 
     117iptables extensions for matching/changing IP packet options. 
     118Includes: 
     119- libipt_CLASSIFY 
     120- libipt_dscp/DSCP 
     121- libipt_ecn/ECN 
     122- libipt_length 
     123- libipt_mac 
     124- libipt_mark/MARK 
     125- libipt_statistic 
     126- libipt_tcpmms 
     127- libipt_tos/TOS 
     128- libipt_ttl/TTL 
     129- libipt_unclean 
    130130endef 
    131131 
     
    136136 
    137137define Package/iptables-mod-ipsec/description 
    138  iptables extensions for matching ipsec traffic. 
    139  Includes: 
    140  - libipt_ah 
    141  - libipt_esp 
    142  - libipt_policy 
     138iptables extensions for matching ipsec traffic. 
     139Includes: 
     140- libipt_ah 
     141- libipt_esp 
     142- libipt_policy 
    143143endef 
    144144 
     
    149149 
    150150define Package/iptables-mod-ipset/description 
    151  IPset iptables extensions. 
    152  Includes: 
    153  - libipt_set 
    154  - libipt_SET 
     151IPset iptables extensions. 
     152Includes: 
     153- libipt_set 
     154- libipt_SET 
    155155endef 
    156156 
     
    161161 
    162162define Package/iptables-mod-nat/description 
    163  iptables extensions for basic NAT targets. 
    164  Includes: 
    165  - MASQUERADE 
    166  - SNAT 
    167  - DNAT 
     163iptables extensions for basic NAT targets. 
     164Includes: 
     165- MASQUERADE 
     166- SNAT 
     167- DNAT 
    168168endef 
    169169 
     
    174174 
    175175define Package/iptables-mod-nat-extra/description 
    176  iptables extensions for extra NAT targets. 
    177  Includes: 
    178  - REDIRECT 
     176iptables extensions for extra NAT targets. 
     177Includes: 
     178- REDIRECT 
    179179endef 
    180180 
     
    185185 
    186186define Package/iptables-mod-ulog/description 
    187  iptables extensions for user-space packet logging. 
    188  Includes: 
    189  - libipt_ULOG 
     187iptables extensions for user-space packet logging. 
     188Includes: 
     189- libipt_ULOG 
    190190endef 
    191191 
     
    196196 
    197197define Package/iptables-mod-iprange/description 
    198  iptables extensions for matching ip ranges. 
    199  Includes: 
    200  - libipt_iprange 
     198iptables extensions for matching ip ranges. 
     199Includes: 
     200- libipt_iprange 
    201201endef 
    202202 
     
    207207 
    208208define Package/iptables-mod-extra/description 
    209  other extra iptables extensions. 
    210  Includes: 
    211  - libipt_owner 
    212  - libipt_physdev 
    213  - libipt_pkttype 
    214  - libipt_recent 
     209Other extra iptables extensions. 
     210Includes: 
     211- libipt_owner 
     212- libipt_physdev 
     213- libipt_pkttype 
     214- libipt_recent 
    215215endef 
    216216 
     
    269269                KBUILD_OUTPUT="$(LINUX_DIR)" \ 
    270270                DESTDIR="$(PKG_INSTALL_DIR)" \ 
    271                 all install $(MAKE_TARGETS) 
     271                $(MAKE_TARGETS) 
    272272 
    273273define Build/Compile 
    274         mkdir -p $(PKG_INSTALL_DIR) 
     274        $(INSTALL_DIR) $(PKG_INSTALL_DIR) 
    275275        $(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS) 
     276        $(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS) install 
    276277        $(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS) 
     278        $(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS) install 
    277279endef 
    278280 
    279281define Build/InstallDev 
    280         mkdir -p $(1)/usr/include 
    281         mkdir -p $(1)/usr/include/iptables 
    282         mkdir -p $(1)/usr/include/net/netfilter 
     282        $(INSTALL_DIR) $(1)/usr/include 
     283        $(INSTALL_DIR) $(1)/usr/include/iptables 
     284        $(INSTALL_DIR) $(1)/usr/include/net/netfilter 
    283285 
    284286        # XXX: iptables header fixup, some headers are not installed by iptables anymore 
     
    291293 
    292294        $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ 
    293         mkdir -p $(1)/usr/lib 
     295        $(INSTALL_DIR) $(1)/usr/lib 
    294296        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.{a,so*} $(1)/usr/lib/ 
    295297        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip*tc.{a,so*} $(1)/usr/lib/ 
    296298        $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(1)/usr/lib/ 
    297         mkdir -p $(1)/usr/lib/pkgconfig 
     299        $(INSTALL_DIR) $(1)/usr/lib/pkgconfig 
    298300        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/xtables.pc $(1)/usr/lib/pkgconfig/ 
    299301        $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libiptc.pc $(1)/usr/lib/pkgconfig/ 
Note: See TracChangeset for help on using the changeset viewer.