package: fold the IPv6 menu into Network

Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 36634

diff --git a/package/network/ipv6/6in4/Makefile b/package/network/ipv6/6in4/Makefile
index 7090234358d221371b7582a250040bbecec78d73..992c5fc67b709fe27b6a0a40d00a6d4737543889 100644 (file)
--- 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
 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 <xm@subsignal.org>
   DEPENDS:=+kmod-ipv6 +kmod-sit
   TITLE:=IPv6-in-IPv4 configuration support
   MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>

diff --git a/package/network/ipv6/6rd/Makefile b/package/network/ipv6/6rd/Makefile
index 6e77d24bc710fabb21f82b7be5a1ac53fa2fc11a..c7015961936b5626eef6cb830d98d3971795413b 100644 (file)
--- 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
 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 <stephan@kochen.nl>
   DEPENDS:=+kmod-ipv6 +kmod-sit
   TITLE:=6rd configuration support
   MAINTAINER:=Stéphan Kochen <stephan@kochen.nl>

diff --git a/package/network/ipv6/6relayd/Makefile b/package/network/ipv6/6relayd/Makefile
index 3c2506f53bdccf33319f359a26c66e5dece9fd6b..8d2e3224e5b883e7e77f879270954dee1c128d43 100644 (file)
--- 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
 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
   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 72906fba5bd323f196fbaf9213222120762e287a..8bdbb82d6e826e115b17a9355af3ca7d2d029a36 100644 (file)
--- 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
 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 <xm@subsignal.org>
   DEPENDS:=+kmod-ipv6 +kmod-sit
   TITLE:=IPv6-to-IPv4 configuration support
   MAINTAINER:=Jo-Philipp Wich <xm@subsignal.org>

diff --git a/package/network/ipv6/ds-lite/Makefile b/package/network/ipv6/ds-lite/Makefile
index ecbcf6b3989836c5f1269f270a49aa7669fb540a..688ddf9017da8df15bb4247d68d89eff1adf2b1e 100644 (file)
--- 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
 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 <steven@midlink.org>
   DEPENDS:=+kmod-ipv6 +kmod-ip6-tunnel
   TITLE:=Dual-Stack Lite (DS-Lite) configuration support
   MAINTAINER:=Steven Barth <steven@midlink.org>

diff --git a/package/network/ipv6/odhcp6c/Makefile b/package/network/ipv6/odhcp6c/Makefile
index fd28dc89da9b4614b3dddb0101a226669302d18b..5fd453bbbfe3d3510b0ced5a59730ee817fd377e 100644 (file)
--- 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
 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
   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 c5bbe618770a9e4d866043f050dd257bd824df13..d63757a5e10edff7c36796409e6a0621dde6730d 100644 (file)
--- 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
 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
     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 4140acb77d4e9ba6ab5b74222891c8fa37daca9f..fb7aef9a0124f0421beb9a11369d09f66fa9e2ef 100644 (file)
--- 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
 define Package/ip6tables
 $(call Package/iptables/Default)
   DEPENDS:=@IPV6 +kmod-ip6tables +iptables

-  CATEGORY:=IPv6
+  CATEGORY:=Network

   TITLE:=IPv6 firewall administration tool
   MENU:=1
 endef
   TITLE:=IPv6 firewall administration tool
   MENU:=1
 endef