diff options
| author | Nicolas Thill <nico@openwrt.org> | 2005-11-12 11:53:55 +0000 |
|---|---|---|
| committer | Nicolas Thill <nico@openwrt.org> | 2005-11-12 11:53:55 +0000 |
| commit | ddceeefc015b870a6da29341328392aa833510d8 (patch) | |
| tree | 5fcb6acf2cf7522606cbf7e7186f059b8ebb454f | |
| parent | 909c7cca7bf5e4882ebf7a5c70367aab79f3247f (diff) | |
| download | mtk-20170518-ddceeefc015b870a6da29341328392aa833510d8.zip mtk-20170518-ddceeefc015b870a6da29341328392aa833510d8.tar.gz mtk-20170518-ddceeefc015b870a6da29341328392aa833510d8.tar.bz2 | |
port iptables fix introduced by changeset:2447 to trunk
SVN-Revision: 2448
| -rw-r--r-- | openwrt/package/iptables/Makefile | 2 | ||||
| -rw-r--r-- | openwrt/target/linux/netfilter.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/openwrt/package/iptables/Makefile b/openwrt/package/iptables/Makefile index f54481c..cdbb866 100644 --- a/openwrt/package/iptables/Makefile +++ b/openwrt/package/iptables/Makefile @@ -75,7 +75,7 @@ $(IPKG_IPTABLES): cp -fpR $(PKG_INSTALL_DIR)/usr/sbin/iptables $(IDIR_IPTABLES)/usr/sbin/ install -d -m0755 $(IDIR_IPTABLES)/usr/lib/iptables (cd $(PKG_INSTALL_DIR)/usr/lib/iptables ; \ - cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y) ipt_standard) $(IDIR_IPTABLES)/usr/lib/iptables/ \ + cp -fpR $(patsubst %,lib%.so,$(IPKG_IPTABLES-y)) $(IDIR_IPTABLES)/usr/lib/iptables/ \ ) $(RSTRIP) $(IDIR_IPTABLES) $(IPKG_BUILD) $(IDIR_IPTABLES) $(PACKAGE_DIR) diff --git a/openwrt/target/linux/netfilter.mk b/openwrt/target/linux/netfilter.mk index 64f4ced..3882a5c 100644 --- a/openwrt/target/linux/netfilter.mk +++ b/openwrt/target/linux/netfilter.mk @@ -71,7 +71,7 @@ IPKG_KMOD_IPT_ULOG-$(CONFIG_IP_NF_TARGET_ULOG) += ipt_ULOG # IPKG_IPTABLES-y := ipt_standard -IPKG_IPTABLES-y := ipt_icmp ipt_tcp ipt_udp +IPKG_IPTABLES-y += ipt_icmp ipt_tcp ipt_udp IPKG_IPTABLES_MOD_CONNTRACK-m := IPKG_IPTABLES_MOD_CONNTRACK-$(CONFIG_IP_NF_MATCH_CONNMARK) += ipt_connmark |