mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 14:34:27 -05:00 
			
		
		
		
	package: Remove dependencies to kmod-ipv6
Since r46834, IPv6 support is builtin if selected. Therefor, dependencies on kmod-ipv6 can no longer be fulfilled, since it is not a module anymore. Signed-off-by: Arjen de Korte <arjen+openwrt@de-korte.org> SVN-Revision: 47022
This commit is contained in:
		
							parent
							
								
									ce59fe6b3d
								
							
						
					
					
						commit
						836d462b10
					
				@ -80,7 +80,7 @@ define KernelPackage/nf-conntrack6
 | 
			
		||||
  SUBMENU:=$(NF_MENU)
 | 
			
		||||
  TITLE:=Netfilter IPv6 connection tracking
 | 
			
		||||
  KCONFIG:=$(KCONFIG_NF_CONNTRACK6)
 | 
			
		||||
  DEPENDS:=+kmod-ipv6 +kmod-nf-conntrack
 | 
			
		||||
  DEPENDS:=@IPV6 +kmod-nf-conntrack
 | 
			
		||||
  FILES:=$(foreach mod,$(NF_CONNTRACK6-m),$(LINUX_DIR)/net/$(mod).ko)
 | 
			
		||||
  AUTOLOAD:=$(call AutoProbe,$(notdir $(NF_CONNTRACK6-m)))
 | 
			
		||||
endef
 | 
			
		||||
@ -454,7 +454,7 @@ $(eval $(call KernelPackage,ipt-led))
 | 
			
		||||
 | 
			
		||||
define KernelPackage/ipt-tproxy
 | 
			
		||||
  TITLE:=Transparent proxying support
 | 
			
		||||
  DEPENDS+=+kmod-ipt-conntrack +IPV6:kmod-ipv6 +IPV6:kmod-ip6tables
 | 
			
		||||
  DEPENDS+=+kmod-ipt-conntrack +IPV6:kmod-ip6tables
 | 
			
		||||
  KCONFIG:= \
 | 
			
		||||
  	CONFIG_NETFILTER_TPROXY \
 | 
			
		||||
  	CONFIG_NETFILTER_XT_MATCH_SOCKET \
 | 
			
		||||
@ -473,7 +473,7 @@ $(eval $(call KernelPackage,ipt-tproxy))
 | 
			
		||||
 | 
			
		||||
define KernelPackage/ipt-tee
 | 
			
		||||
  TITLE:=TEE support
 | 
			
		||||
  DEPENDS:=+kmod-ipt-conntrack +IPV6:kmod-ipv6
 | 
			
		||||
  DEPENDS:=+kmod-ipt-conntrack
 | 
			
		||||
  KCONFIG:= \
 | 
			
		||||
  	CONFIG_NETFILTER_XT_TARGET_TEE
 | 
			
		||||
  FILES:= \
 | 
			
		||||
 | 
			
		||||
@ -42,7 +42,7 @@ endef
 | 
			
		||||
define Package/grev6
 | 
			
		||||
$(call Package/gre/Default)
 | 
			
		||||
  TITLE:=Generic Routing Encapsulation (IPv6) config support
 | 
			
		||||
  DEPENDS:=@(PACKAGE_gre) +kmod-ipv6 +kmod-ip6-gre
 | 
			
		||||
  DEPENDS:=@(PACKAGE_gre) @IPV6 +kmod-ip6-gre
 | 
			
		||||
endef
 | 
			
		||||
 | 
			
		||||
define Package/grev6/description
 | 
			
		||||
 | 
			
		||||
@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
 | 
			
		||||
define Package/6in4
 | 
			
		||||
  SECTION:=net
 | 
			
		||||
  CATEGORY:=Network
 | 
			
		||||
  DEPENDS:=+kmod-ipv6 +kmod-sit
 | 
			
		||||
  DEPENDS:=@IPV6 +kmod-sit
 | 
			
		||||
  TITLE:=IPv6-in-IPv4 configuration support
 | 
			
		||||
  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
 | 
			
		||||
  PKGARCH:=all
 | 
			
		||||
 | 
			
		||||
@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
 | 
			
		||||
define Package/6rd
 | 
			
		||||
  SECTION:=net
 | 
			
		||||
  CATEGORY:=Network
 | 
			
		||||
  DEPENDS:=+kmod-ipv6 +kmod-sit
 | 
			
		||||
  DEPENDS:=@IPV6 +kmod-sit
 | 
			
		||||
  TITLE:=6rd configuration support
 | 
			
		||||
  MAINTAINER:=Steven Barth <cyrus@openwrt.org>
 | 
			
		||||
  PKGARCH:=all
 | 
			
		||||
 | 
			
		||||
@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
 | 
			
		||||
define Package/6to4
 | 
			
		||||
  SECTION:=net
 | 
			
		||||
  CATEGORY:=Network
 | 
			
		||||
  DEPENDS:=+kmod-ipv6 +kmod-sit
 | 
			
		||||
  DEPENDS:=@IPV6 +kmod-sit
 | 
			
		||||
  TITLE:=IPv6-to-IPv4 configuration support
 | 
			
		||||
  MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>
 | 
			
		||||
  PKGARCH:=all
 | 
			
		||||
 | 
			
		||||
@ -17,7 +17,7 @@ include $(INCLUDE_DIR)/package.mk
 | 
			
		||||
define Package/ds-lite
 | 
			
		||||
  SECTION:=net
 | 
			
		||||
  CATEGORY:=Network
 | 
			
		||||
  DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel +resolveip
 | 
			
		||||
  DEPENDS:=@IPV6 +kmod-ip6-tunnel +resolveip
 | 
			
		||||
  TITLE:=Dual-Stack Lite (DS-Lite) configuration support
 | 
			
		||||
  MAINTAINER:=Steven Barth <steven@midlink.org>
 | 
			
		||||
  PKGARCH:=all
 | 
			
		||||
 | 
			
		||||
@ -18,7 +18,7 @@ include $(INCLUDE_DIR)/cmake.mk
 | 
			
		||||
define Package/map
 | 
			
		||||
  SECTION:=net
 | 
			
		||||
  CATEGORY:=Network
 | 
			
		||||
  DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel +libubox +libubus +iptables-mod-conntrack-extra
 | 
			
		||||
  DEPENDS:=@IPV6 +kmod-ip6-tunnel +libubox +libubus +iptables-mod-conntrack-extra
 | 
			
		||||
  TITLE:=MAP-E and Lightweight 4over6 configuration support
 | 
			
		||||
  MAINTAINER:=Steven Barth <steven@midlink.org>
 | 
			
		||||
endef
 | 
			
		||||
 | 
			
		||||
@ -30,7 +30,7 @@ define Package/odhcp6c
 | 
			
		||||
  SECTION:=net
 | 
			
		||||
  CATEGORY:=Network
 | 
			
		||||
  TITLE:=Embedded DHCPv6-client for OpenWrt
 | 
			
		||||
  DEPENDS:=+kmod-ipv6
 | 
			
		||||
  DEPENDS:=@IPV6
 | 
			
		||||
endef
 | 
			
		||||
 | 
			
		||||
define Package/odhcp6c/config
 | 
			
		||||
 | 
			
		||||
@ -44,7 +44,7 @@ endef
 | 
			
		||||
define Package/dnsmasq-dhcpv6
 | 
			
		||||
$(call Package/dnsmasq/Default)
 | 
			
		||||
  TITLE += (with DHCPv6 support)
 | 
			
		||||
  DEPENDS:=@IPV6 +kmod-ipv6
 | 
			
		||||
  DEPENDS:=@IPV6
 | 
			
		||||
  VARIANT:=dhcpv6
 | 
			
		||||
endef
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
@ -147,6 +147,6 @@ $(eval $(call BuildTemplate,lua,Lua PacketScript,xt_LUA,LUA/xt_LUA,+kmod-ipt-con
 | 
			
		||||
$(eval $(call BuildTemplate,psd,psd,xt_psd,xt_psd,))
 | 
			
		||||
$(eval $(call BuildTemplate,quota2,quota2,xt_quota2,xt_quota2,))
 | 
			
		||||
$(eval $(call BuildTemplate,sysrq,SYSRQ,xt_SYSRQ,xt_SYSRQ,+kmod-ipt-compat-xtables))
 | 
			
		||||
$(eval $(call BuildTemplate,tarpit,TARPIT,xt_TARPIT,xt_TARPIT,+kmod-ipt-compat-xtables +IPV6:kmod-ipv6))
 | 
			
		||||
$(eval $(call BuildTemplate,tarpit,TARPIT,xt_TARPIT,xt_TARPIT,+kmod-ipt-compat-xtables))
 | 
			
		||||
 | 
			
		||||
$(eval $(call BuildPackage,iptaccount))
 | 
			
		||||
 | 
			
		||||
		Loading…
	
		Reference in New Issue
	
	Block a user