From patchwork Fri Sep 18 13:50:44 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arjen de Korte X-Patchwork-Id: 519303 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from arrakis.dune.hu (arrakis.dune.hu [78.24.191.176]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5485C140281 for ; Fri, 18 Sep 2015 23:52:03 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=de-korte.org header.i=@de-korte.org header.b=LBrob4SV; dkim-atps=neutral Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id D1282283FA5; Fri, 18 Sep 2015 15:50:12 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on arrakis.dune.hu X-Spam-Level: X-Spam-Status: No, score=-1.5 required=5.0 tests=BAYES_00,T_DKIM_INVALID autolearn=unavailable version=3.3.2 Received: from arrakis.dune.hu (localhost [127.0.0.1]) by arrakis.dune.hu (Postfix) with ESMTP id B55C22801D9 for ; Fri, 18 Sep 2015 15:50:02 +0200 (CEST) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 CL_IP_EQ_HELO_IP=-2 (check from: .de-korte. - helo: .smtp02.mail.pcextreme. - helo-domain: .pcextreme.) FROM/MX_MATCHES_NOT_HELO(DOMAIN)=1; rate: -5.5 Received: from smtp02.mail.pcextreme.nl (smtp02.mail.pcextreme.nl [109.72.87.139]) by arrakis.dune.hu (Postfix) with ESMTP for ; Fri, 18 Sep 2015 15:49:51 +0200 (CEST) Received: from mail.de-korte.org (de-korte.org [IPv6:2001:470:1f15:a60::10]) by smtp02.mail.pcextreme.nl (Postfix) with ESMTPSA id 52A413FC41 for ; Fri, 18 Sep 2015 15:51:00 +0200 (CEST) Received: from localhost (localhost [IPv6:::1]) by mail.de-korte.org (Postfix) with ESMTP id A25D440E3D; Fri, 18 Sep 2015 15:50:59 +0200 (CEST) Authentication-Results: localhost (amavisd-new); dkim=pass (1024-bit key) reason="pass (just generated, assumed good)" header.d=de-korte.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=de-korte.org; h= x-mailer:message-id:date:date:subject:subject:from:from:received :received; s=dkim; t=1442584259; x=1444398660; bh=8Qdvuy5pz7Fqlt 2Ki8t/Y6orE+A0FKarrMCtjKsoh6E=; b=LBrob4SV9wcvDJ67r2dFD/YBGO8A/H m/NFsz/VB0tNIzBYKumz0E/QFpzy/cvwnI499E5t4bONLWRl/P/k+L0lhmD6n+D6 Ad5EvX7GLWnMmZ7N/retr34dnpjwOm/IGXoDT1RrPqHP4/wUgxAyU5kXxGdANo+W 7J/1Jst+kKoMs= X-Virus-Scanned: amavisd-new at de-korte.org Received: from mail.de-korte.org ([IPv6:::1]) by localhost (localhost [IPv6:::1]) (amavisd-new, port 10026) with ESMTP id yRe2s6hID3FA; Fri, 18 Sep 2015 15:50:59 +0200 (CEST) Received: from orthros.de-korte.org (orthros.de-korte.org [IPv6:2001:470:1f15:a60::100]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.de-korte.org (Postfix) with ESMTPSA; Fri, 18 Sep 2015 15:50:59 +0200 (CEST) From: Arjen de Korte To: openwrt-devel@lists.openwrt.org Date: Fri, 18 Sep 2015 15:50:44 +0200 Message-Id: <1442584244-18783-1-git-send-email-arjen+openwrt@de-korte.org> X-Mailer: git-send-email 2.5.1 Subject: [OpenWrt-Devel] [PATCH] package: Remove dependencies to kmod-ipv6 X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openwrt-devel-bounces@lists.openwrt.org Sender: "openwrt-devel" 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 --- package/kernel/linux/modules/netfilter.mk | 6 +++--- package/network/config/gre/Makefile | 2 +- package/network/ipv6/6in4/Makefile | 2 +- package/network/ipv6/6rd/Makefile | 2 +- package/network/ipv6/6to4/Makefile | 2 +- package/network/ipv6/ds-lite/Makefile | 2 +- package/network/ipv6/map/Makefile | 2 +- package/network/ipv6/odhcp6c/Makefile | 2 +- package/network/services/dnsmasq/Makefile | 2 +- package/network/utils/xtables-addons/Makefile | 2 +- 10 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package/kernel/linux/modules/netfilter.mk b/package/kernel/linux/modules/netfilter.mk index 3a436ac..e21895d 100644 --- a/package/kernel/linux/modules/netfilter.mk +++ b/package/kernel/linux/modules/netfilter.mk @@ -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:= \ diff --git a/package/network/config/gre/Makefile b/package/network/config/gre/Makefile index 217c276..49e7d19 100644 --- a/package/network/config/gre/Makefile +++ b/package/network/config/gre/Makefile @@ -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 diff --git a/package/network/ipv6/6in4/Makefile b/package/network/ipv6/6in4/Makefile index b7c2da7..2ffdfc0 100644 --- a/package/network/ipv6/6in4/Makefile +++ b/package/network/ipv6/6in4/Makefile @@ -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 PKGARCH:=all diff --git a/package/network/ipv6/6rd/Makefile b/package/network/ipv6/6rd/Makefile index cde7117..04d607e 100644 --- a/package/network/ipv6/6rd/Makefile +++ b/package/network/ipv6/6rd/Makefile @@ -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 PKGARCH:=all diff --git a/package/network/ipv6/6to4/Makefile b/package/network/ipv6/6to4/Makefile index fcec90d..20605f6 100644 --- a/package/network/ipv6/6to4/Makefile +++ b/package/network/ipv6/6to4/Makefile @@ -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 PKGARCH:=all diff --git a/package/network/ipv6/ds-lite/Makefile b/package/network/ipv6/ds-lite/Makefile index 8c22c46..919ac7e 100644 --- a/package/network/ipv6/ds-lite/Makefile +++ b/package/network/ipv6/ds-lite/Makefile @@ -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 PKGARCH:=all diff --git a/package/network/ipv6/map/Makefile b/package/network/ipv6/map/Makefile index f6f2cd6..af6f758 100644 --- a/package/network/ipv6/map/Makefile +++ b/package/network/ipv6/map/Makefile @@ -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 endef diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile index 7c88d59..0b38be9 100644 --- a/package/network/ipv6/odhcp6c/Makefile +++ b/package/network/ipv6/odhcp6c/Makefile @@ -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 diff --git a/package/network/services/dnsmasq/Makefile b/package/network/services/dnsmasq/Makefile index bf9d0a6..cddde5c 100644 --- a/package/network/services/dnsmasq/Makefile +++ b/package/network/services/dnsmasq/Makefile @@ -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 diff --git a/package/network/utils/xtables-addons/Makefile b/package/network/utils/xtables-addons/Makefile index 8f54ee3..ff6466f 100644 --- a/package/network/utils/xtables-addons/Makefile +++ b/package/network/utils/xtables-addons/Makefile @@ -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))