Author: cyrus Date: 2015-09-21 23:15:41 +0200 (Mon, 21 Sep 2015) New Revision: 47022
Modified: trunk/package/kernel/linux/modules/netfilter.mk trunk/package/network/config/gre/Makefile trunk/package/network/ipv6/6in4/Makefile trunk/package/network/ipv6/6rd/Makefile trunk/package/network/ipv6/6to4/Makefile trunk/package/network/ipv6/ds-lite/Makefile trunk/package/network/ipv6/map/Makefile trunk/package/network/ipv6/odhcp6c/Makefile trunk/package/network/services/dnsmasq/Makefile trunk/package/network/utils/xtables-addons/Makefile Log: 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 <[email protected]> Modified: trunk/package/kernel/linux/modules/netfilter.mk =================================================================== --- trunk/package/kernel/linux/modules/netfilter.mk 2015-09-21 21:10:43 UTC (rev 47021) +++ trunk/package/kernel/linux/modules/netfilter.mk 2015-09-21 21:15:41 UTC (rev 47022) @@ -80,7 +80,7 @@ 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 @@ 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 @@ 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:= \ Modified: trunk/package/network/config/gre/Makefile =================================================================== --- trunk/package/network/config/gre/Makefile 2015-09-21 21:10:43 UTC (rev 47021) +++ trunk/package/network/config/gre/Makefile 2015-09-21 21:15:41 UTC (rev 47022) @@ -42,7 +42,7 @@ 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 Modified: trunk/package/network/ipv6/6in4/Makefile =================================================================== --- trunk/package/network/ipv6/6in4/Makefile 2015-09-21 21:10:43 UTC (rev 47021) +++ trunk/package/network/ipv6/6in4/Makefile 2015-09-21 21:15:41 UTC (rev 47022) @@ -17,7 +17,7 @@ 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 <[email protected]> PKGARCH:=all Modified: trunk/package/network/ipv6/6rd/Makefile =================================================================== --- trunk/package/network/ipv6/6rd/Makefile 2015-09-21 21:10:43 UTC (rev 47021) +++ trunk/package/network/ipv6/6rd/Makefile 2015-09-21 21:15:41 UTC (rev 47022) @@ -17,7 +17,7 @@ define Package/6rd SECTION:=net CATEGORY:=Network - DEPENDS:=+kmod-ipv6 +kmod-sit + DEPENDS:=@IPV6 +kmod-sit TITLE:=6rd configuration support MAINTAINER:=Steven Barth <[email protected]> PKGARCH:=all Modified: trunk/package/network/ipv6/6to4/Makefile =================================================================== --- trunk/package/network/ipv6/6to4/Makefile 2015-09-21 21:10:43 UTC (rev 47021) +++ trunk/package/network/ipv6/6to4/Makefile 2015-09-21 21:15:41 UTC (rev 47022) @@ -17,7 +17,7 @@ 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 <[email protected]> PKGARCH:=all Modified: trunk/package/network/ipv6/ds-lite/Makefile =================================================================== --- trunk/package/network/ipv6/ds-lite/Makefile 2015-09-21 21:10:43 UTC (rev 47021) +++ trunk/package/network/ipv6/ds-lite/Makefile 2015-09-21 21:15:41 UTC (rev 47022) @@ -17,7 +17,7 @@ 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 <[email protected]> PKGARCH:=all Modified: trunk/package/network/ipv6/map/Makefile =================================================================== --- trunk/package/network/ipv6/map/Makefile 2015-09-21 21:10:43 UTC (rev 47021) +++ trunk/package/network/ipv6/map/Makefile 2015-09-21 21:15:41 UTC (rev 47022) @@ -18,7 +18,7 @@ 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 <[email protected]> endef Modified: trunk/package/network/ipv6/odhcp6c/Makefile =================================================================== --- trunk/package/network/ipv6/odhcp6c/Makefile 2015-09-21 21:10:43 UTC (rev 47021) +++ trunk/package/network/ipv6/odhcp6c/Makefile 2015-09-21 21:15:41 UTC (rev 47022) @@ -30,7 +30,7 @@ SECTION:=net CATEGORY:=Network TITLE:=Embedded DHCPv6-client for OpenWrt - DEPENDS:=+kmod-ipv6 + DEPENDS:=@IPV6 endef define Package/odhcp6c/config Modified: trunk/package/network/services/dnsmasq/Makefile =================================================================== --- trunk/package/network/services/dnsmasq/Makefile 2015-09-21 21:10:43 UTC (rev 47021) +++ trunk/package/network/services/dnsmasq/Makefile 2015-09-21 21:15:41 UTC (rev 47022) @@ -44,7 +44,7 @@ define Package/dnsmasq-dhcpv6 $(call Package/dnsmasq/Default) TITLE += (with DHCPv6 support) - DEPENDS:=@IPV6 +kmod-ipv6 + DEPENDS:=@IPV6 VARIANT:=dhcpv6 endef Modified: trunk/package/network/utils/xtables-addons/Makefile =================================================================== --- trunk/package/network/utils/xtables-addons/Makefile 2015-09-21 21:10:43 UTC (rev 47021) +++ trunk/package/network/utils/xtables-addons/Makefile 2015-09-21 21:15:41 UTC (rev 47022) @@ -147,6 +147,6 @@ $(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)) _______________________________________________ openwrt-commits mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-commits
