From d481486aad6189731aeb33239970288c73df7b05 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 14 May 2013 15:02:31 +0000 Subject: [PATCH] package: fold the IPv6 menu into Network Signed-off-by: Felix Fietkau SVN-Revision: 36634 --- package/network/ipv6/6in4/Makefile | 4 ++-- package/network/ipv6/6rd/Makefile | 4 ++-- package/network/ipv6/6relayd/Makefile | 4 ++-- package/network/ipv6/6to4/Makefile | 4 ++-- package/network/ipv6/ds-lite/Makefile | 4 ++-- package/network/ipv6/odhcp6c/Makefile | 4 ++-- package/network/ipv6/thc-ipv6/Makefile | 4 ++-- package/network/utils/iptables/Makefile | 2 +- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/package/network/ipv6/6in4/Makefile b/package/network/ipv6/6in4/Makefile index 7090234358d..992c5fc67b7 100644 --- a/package/network/ipv6/6in4/Makefile +++ b/package/network/ipv6/6in4/Makefile @@ -14,8 +14,8 @@ PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk define Package/6in4 - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+kmod-ipv6 +kmod-sit TITLE:=IPv6-in-IPv4 configuration support MAINTAINER:=Jo-Philipp Wich diff --git a/package/network/ipv6/6rd/Makefile b/package/network/ipv6/6rd/Makefile index 6e77d24bc71..c7015961936 100644 --- a/package/network/ipv6/6rd/Makefile +++ b/package/network/ipv6/6rd/Makefile @@ -14,8 +14,8 @@ PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk define Package/6rd - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+kmod-ipv6 +kmod-sit TITLE:=6rd configuration support MAINTAINER:=Stéphan Kochen diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile index 3c2506f53bd..8d2e3224e5b 100644 --- a/package/network/ipv6/6relayd/Makefile +++ b/package/network/ipv6/6relayd/Makefile @@ -23,8 +23,8 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk define Package/6relayd - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network TITLE:=DHCPv6(-PD)/RA Server & Relay DEPENDS:=+kmod-ipv6 endef diff --git a/package/network/ipv6/6to4/Makefile b/package/network/ipv6/6to4/Makefile index 72906fba5bd..8bdbb82d6e8 100644 --- a/package/network/ipv6/6to4/Makefile +++ b/package/network/ipv6/6to4/Makefile @@ -14,8 +14,8 @@ PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk define Package/6to4 - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+kmod-ipv6 +kmod-sit TITLE:=IPv6-to-IPv4 configuration support MAINTAINER:=Jo-Philipp Wich diff --git a/package/network/ipv6/ds-lite/Makefile b/package/network/ipv6/ds-lite/Makefile index ecbcf6b3989..688ddf9017d 100644 --- a/package/network/ipv6/ds-lite/Makefile +++ b/package/network/ipv6/ds-lite/Makefile @@ -14,8 +14,8 @@ PKG_RELEASE:=1 include $(INCLUDE_DIR)/package.mk define Package/ds-lite - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel TITLE:=Dual-Stack Lite (DS-Lite) configuration support MAINTAINER:=Steven Barth diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile index fd28dc89da9..5fd453bbbfe 100644 --- a/package/network/ipv6/odhcp6c/Makefile +++ b/package/network/ipv6/odhcp6c/Makefile @@ -22,8 +22,8 @@ include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/cmake.mk define Package/odhcp6c - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network TITLE:=Embedded DHCPv6-client for OpenWrt DEPENDS:=+kmod-ipv6 endef diff --git a/package/network/ipv6/thc-ipv6/Makefile b/package/network/ipv6/thc-ipv6/Makefile index c5bbe618770..d63757a5e10 100644 --- a/package/network/ipv6/thc-ipv6/Makefile +++ b/package/network/ipv6/thc-ipv6/Makefile @@ -37,8 +37,8 @@ THC_DEPENDS_thcping6 := +librt define BuildTool define Package/thc-ipv6-$(subst _,-,$(1)) TITLE:=THC-IPv6 $(1) utility - SECTION:=ipv6 - CATEGORY:=IPv6 + SECTION:=net + CATEGORY:=Network DEPENDS:=+libpcap $(THC_DEPENDS_$(1)) URL:=http://freeworld.thc.org/ SUBMENU:=THC-IPv6 attack and analyzing toolkit diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile index 4140acb77d4..fb7aef9a012 100644 --- a/package/network/utils/iptables/Makefile +++ b/package/network/utils/iptables/Makefile @@ -301,7 +301,7 @@ endef define Package/ip6tables $(call Package/iptables/Default) DEPENDS:=@IPV6 +kmod-ip6tables +iptables - CATEGORY:=IPv6 + CATEGORY:=Network TITLE:=IPv6 firewall administration tool MENU:=1 endef -- 2.30.2