Changeset 35898


Ignore:
Timestamp:
2013-03-07T09:48:41+01:00 (5 years ago)
Author:
cyrus
Message:

iptables: Add missing IPv6 builtin modules

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/include/netfilter.mk

    r35475 r35898  
    144144$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_QUEUE, $(P_V6)ip6_queue),)) 
    145145$(eval $(if $(NF_KMOD),$(call nf_add,IPT_IPV6,CONFIG_IP6_NF_RAW, $(P_V6)ip6table_raw),)) 
     146 
     147$(eval $(if $(NF_KMOD),,$(call nf_add,IPT_CORE,CONFIG_IP6_NF_IPTABLES, ip6t_icmp6))) 
    146148 
    147149$(eval $(call nf_add,IPT_IPV6,CONFIG_IP6_NF_MATCH_AH, $(P_V6)ip6t_ah)) 
     
    284286IPT_BUILTIN += $(IPT_IPRANGE-y) 
    285287IPT_BUILTIN += $(IPT_IPSEC-y) 
    286 IPT_BUILTIN += $(IPT_IPV6-y) 
     288IPT_BUILTIN += $(IPT_IPV6-y) $(IPT_IPV6-m) 
    287289IPT_BUILTIN += $(IPT_NAT-y) 
    288290IPT_BUILTIN += $(IPT_NAT_EXTRA-y) 
  • trunk/package/network/utils/iptables/Makefile

    r35896 r35898  
    1111PKG_NAME:=iptables 
    1212PKG_VERSION:=1.4.18 
    13 PKG_RELEASE:=1 
     13PKG_RELEASE:=2 
    1414 
    1515PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
     
    358358        KERNEL_DIR="$(LINUX_DIR)/user_headers/" PREFIX=/usr \ 
    359359        KBUILD_OUTPUT="$(LINUX_DIR)" \ 
    360         BUILTIN_MODULES="$(patsubst ipt_%,%,$(patsubst xt_%,%,$(IPT_BUILTIN) $(IPT_CONNTRACK-m) $(IPT_NAT-m)))" 
     360        BUILTIN_MODULES="$(patsubst ip6t_%,%,$(patsubst ipt_%,%,$(patsubst xt_%,%,$(IPT_BUILTIN) $(IPT_CONNTRACK-m) $(IPT_NAT-m))))" 
    361361 
    362362define Build/InstallDev 
     
    416416  define Package/$(1)/install 
    417417        $(INSTALL_DIR) $$(1)/usr/lib/iptables 
    418         for m in $(patsubst xt_%,ipt_%,$(2)) $(patsubst ipt_%,xt_%,$(2)); do \ 
     418        for m in $(patsubst xt_%,ipt_%,$(2)) $(patsubst ipt_%,xt_%,$(2)) $(patsubst xt_%,ip6t_%,$(2)) $(patsubst ip6t_%,xt_%,$(2)); do \ 
    419419                if [ -f $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so ]; then \ 
    420420                        $(CP) $(PKG_INSTALL_DIR)/usr/lib/iptables/lib$$$$$$$${m}.so $$(1)/usr/lib/iptables/ ; \ 
Note: See TracChangeset for help on using the changeset viewer.