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 | d873e68e94617bd68b0ed22b9b5ac7cf7dce5d6c (patch) | |
| tree | 2d98d8eeb1cb286c7ce59051a09dbfdd92afea60 | |
| parent | 6b94677a33e5cde0fda9d48e92affc7ab5bbceb4 (diff) | |
| download | upstream-d873e68e94617bd68b0ed22b9b5ac7cf7dce5d6c.tar.gz upstream-d873e68e94617bd68b0ed22b9b5ac7cf7dce5d6c.tar.bz2 upstream-d873e68e94617bd68b0ed22b9b5ac7cf7dce5d6c.zip | |
port iptables fix introduced by changeset:2447 to trunk
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@2448 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -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 f54481c05b9..cdbb866a09c 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 433c386d6ec..6375a71f215 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
|