RepoMirrors/openwrt
1
0
Fork 0
mirror of git://git.openwrt.org/openwrt/openwrt.git synced 2024-12-11 17:34:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

this patch fixes iptables parallel build.

Browse Source 
-Raphael

SVN-Revision: 20188
This commit is contained in:
Travis Kemen 2010-03-14 01:53:41 +00:00
parent 5a32f56774
commit fafcea14a6
1 changed files with 80 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
package/iptables/Makefile
View File

@ -1,5 +1,5 @@
# #
# Copyright (C) 2006-2009 OpenWrt.org # Copyright (C) 2006-2010 OpenWrt.org
# #
# This is free software, licensed under the GNU General Public License v2. # This is free software, licensed under the GNU General Public License v2.
# See /LICENSE for more information. # See /LICENSE for more information.
@ -10,7 +10,7 @@ include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=iptables PKG_NAME:=iptables
PKG_VERSION:=1.4.6 PKG_VERSION:=1.4.6
PKG_RELEASE:=1 PKG_RELEASE:=2
PKG_MD5SUM:=c67cf30e281a924def6426be0973df56 PKG_MD5SUM:=c67cf30e281a924def6426be0973df56
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@ -19,7 +19,7 @@ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \ ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
ftp://ftp.no.netfilter.org/pub/netfilter/iptables/ ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
PKG_FIXUP = libtool PKG_FIXUP:=libtool
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
ifeq ($(DUMP),) ifeq ($(DUMP),)
@ -48,15 +48,15 @@ $(call Package/iptables/Default)
endef endef
define Package/iptables/description define Package/iptables/description
IPv4 firewall administration tool. IPv4 firewall administration tool.
Includes support for: Includes support for:
- comment - comment
- limit - limit
- LOG - LOG
- mac - mac
- multiport - multiport
- REJECT - REJECT
- TCPMSS - TCPMSS
endef endef
define Package/iptables-mod-conntrack define Package/iptables-mod-conntrack
@ -65,11 +65,11 @@ $(call Package/iptables/Module, +kmod-ipt-conntrack)
endef endef
define Package/iptables-mod-conntrack/description define Package/iptables-mod-conntrack/description
Basic iptables extensions for connection tracking. Basic iptables extensions for connection tracking.
Includes: Includes:
- state - state
- raw - raw
- NOTRACK - NOTRACK
endef endef
define Package/iptables-mod-conntrack-extra define Package/iptables-mod-conntrack-extra
@ -78,11 +78,11 @@ $(call Package/iptables/Module, +kmod-ipt-conntrack-extra)
endef endef
define Package/iptables-mod-conntrack-extra/description define Package/iptables-mod-conntrack-extra/description
Extra iptables extensions for connection tracking. Extra iptables extensions for connection tracking.
Includes: Includes:
- libipt_conntrack - libipt_conntrack
- libipt_helper - libipt_helper
- libipt_connmark/CONNMARK - libipt_connmark/CONNMARK
endef endef
define Package/iptables-mod-filter define Package/iptables-mod-filter
@ -91,10 +91,10 @@ $(call Package/iptables/Module, +kmod-ipt-filter)
endef endef
define Package/iptables-mod-filter/description define Package/iptables-mod-filter/description
iptables extensions for packet content inspection. iptables extensions for packet content inspection.
Includes: Includes:
- libipt_string - libipt_string
- libipt_layer7 - libipt_layer7
endef endef
define Package/iptables-mod-imq define Package/iptables-mod-imq
@ -103,9 +103,9 @@ $(call Package/iptables/Module, +kmod-ipt-imq)
endef endef
define Package/iptables-mod-imq/description define Package/iptables-mod-imq/description
iptables extension for IMQ support. iptables extension for IMQ support.
Includes: Includes:
- libipt_IMQ - libipt_IMQ
endef endef
define Package/iptables-mod-ipopt define Package/iptables-mod-ipopt
@ -114,19 +114,19 @@ $(call Package/iptables/Module, +kmod-ipt-ipopt)
endef endef
define Package/iptables-mod-ipopt/description define Package/iptables-mod-ipopt/description
iptables extensions for matching/changing IP packet options. iptables extensions for matching/changing IP packet options.
Includes: Includes:
- libipt_CLASSIFY - libipt_CLASSIFY
- libipt_dscp/DSCP - libipt_dscp/DSCP
- libipt_ecn/ECN - libipt_ecn/ECN
- libipt_length - libipt_length
- libipt_mac - libipt_mac
- libipt_mark/MARK - libipt_mark/MARK
- libipt_statistic - libipt_statistic
- libipt_tcpmms - libipt_tcpmms
- libipt_tos/TOS - libipt_tos/TOS
- libipt_ttl/TTL - libipt_ttl/TTL
- libipt_unclean - libipt_unclean
endef endef
define Package/iptables-mod-ipsec define Package/iptables-mod-ipsec
@ -135,11 +135,11 @@ $(call Package/iptables/Module, +kmod-ipt-ipsec)
endef endef
define Package/iptables-mod-ipsec/description define Package/iptables-mod-ipsec/description
iptables extensions for matching ipsec traffic. iptables extensions for matching ipsec traffic.
Includes: Includes:
- libipt_ah - libipt_ah
- libipt_esp - libipt_esp
- libipt_policy - libipt_policy
endef endef
define Package/iptables-mod-ipset define Package/iptables-mod-ipset
@ -148,10 +148,10 @@ $(call Package/iptables/Module, @LINUX_2_6)
endef endef
define Package/iptables-mod-ipset/description define Package/iptables-mod-ipset/description
IPset iptables extensions. IPset iptables extensions.
Includes: Includes:
- libipt_set - libipt_set
- libipt_SET - libipt_SET
endef endef
define Package/iptables-mod-nat define Package/iptables-mod-nat
@ -160,11 +160,11 @@ $(call Package/iptables/Module, +kmod-ipt-nat)
endef endef
define Package/iptables-mod-nat/description define Package/iptables-mod-nat/description
iptables extensions for basic NAT targets. iptables extensions for basic NAT targets.
Includes: Includes:
- MASQUERADE - MASQUERADE
- SNAT - SNAT
- DNAT - DNAT
endef endef
define Package/iptables-mod-nat-extra define Package/iptables-mod-nat-extra
@ -173,9 +173,9 @@ $(call Package/iptables/Module, +kmod-ipt-nat-extra)
endef endef
define Package/iptables-mod-nat-extra/description define Package/iptables-mod-nat-extra/description
iptables extensions for extra NAT targets. iptables extensions for extra NAT targets.
Includes: Includes:
- REDIRECT - REDIRECT
endef endef
define Package/iptables-mod-ulog define Package/iptables-mod-ulog
@ -184,9 +184,9 @@ $(call Package/iptables/Module, +kmod-ipt-ulog)
endef endef
define Package/iptables-mod-ulog/description define Package/iptables-mod-ulog/description
iptables extensions for user-space packet logging. iptables extensions for user-space packet logging.
Includes: Includes:
- libipt_ULOG - libipt_ULOG
endef endef
define Package/iptables-mod-iprange define Package/iptables-mod-iprange
@ -195,9 +195,9 @@ $(call Package/iptables/Module, +kmod-ipt-iprange)
endef endef
define Package/iptables-mod-iprange/description define Package/iptables-mod-iprange/description
iptables extensions for matching ip ranges. iptables extensions for matching ip ranges.
Includes: Includes:
- libipt_iprange - libipt_iprange
endef endef
define Package/iptables-mod-extra define Package/iptables-mod-extra
@ -206,12 +206,12 @@ $(call Package/iptables/Module, +kmod-ipt-extra)
endef endef
define Package/iptables-mod-extra/description define Package/iptables-mod-extra/description
other extra iptables extensions. Other extra iptables extensions.
Includes: Includes:
- libipt_owner - libipt_owner
- libipt_physdev - libipt_physdev
- libipt_pkttype - libipt_pkttype
- libipt_recent - libipt_recent
endef endef
define Package/iptables-utils define Package/iptables-utils
@ -268,18 +268,20 @@ IPTABLES_MAKEOPTS = \
KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \ KERNEL_DIR="$(LINUX_DIR)" PREFIX=/usr \
KBUILD_OUTPUT="$(LINUX_DIR)" \ KBUILD_OUTPUT="$(LINUX_DIR)" \
DESTDIR="$(PKG_INSTALL_DIR)" \ DESTDIR="$(PKG_INSTALL_DIR)" \
all install $(MAKE_TARGETS) $(MAKE_TARGETS)
define Build/Compile define Build/Compile
mkdir -p $(PKG_INSTALL_DIR) $(INSTALL_DIR) $(PKG_INSTALL_DIR)
$(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS) $(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS)
$(MAKE) -C $(PKG_BUILD_DIR) $(IPTABLES_MAKEOPTS) install
$(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS) $(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS)
$(MAKE) -C $(PKG_BUILD_DIR)/libipq $(IPTABLES_MAKEOPTS) install
endef endef
define Build/InstallDev define Build/InstallDev
mkdir -p $(1)/usr/include $(INSTALL_DIR) $(1)/usr/include
mkdir -p $(1)/usr/include/iptables $(INSTALL_DIR) $(1)/usr/include/iptables
mkdir -p $(1)/usr/include/net/netfilter $(INSTALL_DIR) $(1)/usr/include/net/netfilter
# XXX: iptables header fixup, some headers are not installed by iptables anymore # XXX: iptables header fixup, some headers are not installed by iptables anymore
$(CP) $(PKG_BUILD_DIR)/include/net/netfilter/*.h $(1)/usr/include/net/netfilter/ $(CP) $(PKG_BUILD_DIR)/include/net/netfilter/*.h $(1)/usr/include/net/netfilter/
@ -290,11 +292,11 @@ define Build/InstallDev
$(CP) $(PKG_BUILD_DIR)/include/libiptc $(1)/usr/include/ $(CP) $(PKG_BUILD_DIR)/include/libiptc $(1)/usr/include/
$(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/ $(CP) $(PKG_INSTALL_DIR)/usr/include/* $(1)/usr/include/
mkdir -p $(1)/usr/lib $(INSTALL_DIR) $(1)/usr/lib
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libxtables.{a,so*} $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libip*tc.{a,so*} $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libip*tc.{a,so*} $(1)/usr/lib/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(1)/usr/lib/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/libipq.a $(1)/usr/lib/
mkdir -p $(1)/usr/lib/pkgconfig $(INSTALL_DIR) $(1)/usr/lib/pkgconfig
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/xtables.pc $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/xtables.pc $(1)/usr/lib/pkgconfig/
$(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libiptc.pc $(1)/usr/lib/pkgconfig/ $(CP) $(PKG_INSTALL_DIR)/usr/lib/pkgconfig/libiptc.pc $(1)/usr/lib/pkgconfig/
endef endef