packages: move batman kmods into Kernel Modules menu

SVN-Revision: 10606

diff --git a/net/batman-advanced/Makefile b/net/batman-advanced/Makefile
index de581c4..c550265 100644 (file)
--- a/net/batman-advanced/Makefile
+++ b/net/batman-advanced/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -31,14 +31,14 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 define Package/batman-adv/Default
 include $(INCLUDE_DIR)/kernel.mk
 
 define Package/batman-adv/Default

-  SECTION:=net
-  CATEGORY:=Network

   URL:=https://www.open-mesh.net/
   MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
 endef
 
 define Package/batmand-adv
 $(call Package/batman-adv/Default)
   URL:=https://www.open-mesh.net/
   MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
 endef
 
 define Package/batmand-adv
 $(call Package/batman-adv/Default)

+  SECTION:=net
+  CATEGORY:=Network

   DEPENDS:=+libpthread +kmod-tun
   TITLE:=B.A.T.M.A.N. layer 2 routing daemon
 endef
   DEPENDS:=+libpthread +kmod-tun
   TITLE:=B.A.T.M.A.N. layer 2 routing daemon
 endef


@@ -49,6 +49,8 @@ endef
 
 define Package/battool
 $(call Package/batman-adv/Default)
 
 define Package/battool
 $(call Package/batman-adv/Default)

+  SECTION:=net
+  CATEGORY:=Network

   TITLE:=B.A.T.M.A.N. layer 2 debug tools
 endef
 
   TITLE:=B.A.T.M.A.N. layer 2 debug tools
 endef
 


@@ -58,6 +60,7 @@ endef
 
 define KernelPackage/batman-adv-core
 $(call Package/batman-adv/Default)
 
 define KernelPackage/batman-adv-core
 $(call Package/batman-adv/Default)

+  SUBMENU:=Network Support

   DEPENDS:=@LINUX_2_6
   TITLE:=Kernel routing module for B.A.T.M.A.N. layer 2
   FILES:=$(PKG_KMOD_BUILD_DIR)/batman-adv-core.$(LINUX_KMOD_SUFFIX)
   DEPENDS:=@LINUX_2_6
   TITLE:=Kernel routing module for B.A.T.M.A.N. layer 2
   FILES:=$(PKG_KMOD_BUILD_DIR)/batman-adv-core.$(LINUX_KMOD_SUFFIX)

diff --git a/net/batman/Makefile b/net/batman/Makefile
index ec4254c..0184c67 100644 (file)
--- a/net/batman/Makefile
+++ b/net/batman/Makefile
@@ -1,5 +1,5 @@
 #
 #

-# Copyright (C) 2006 OpenWrt.org
+# Copyright (C) 2008 OpenWrt.org

 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.


@@ -28,14 +28,14 @@ include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 define Package/batmand/Default
 include $(INCLUDE_DIR)/kernel.mk
 
 define Package/batmand/Default

-  SECTION:=net
-  CATEGORY:=Network

   URL:=https://www.open-mesh.net/
   MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
 endef
 
 define Package/batmand
 $(call Package/batmand/Default)
   URL:=https://www.open-mesh.net/
   MAINTAINER:=Marek Lindner <lindner_marek@yahoo.de>
 endef
 
 define Package/batmand
 $(call Package/batmand/Default)

+  SECTION:=net
+  CATEGORY:=Network

   DEPENDS:=+libpthread +kmod-tun
   TITLE:=B.A.T.M.A.N. layer 3 routing daemon
 endef
   DEPENDS:=+libpthread +kmod-tun
   TITLE:=B.A.T.M.A.N. layer 3 routing daemon
 endef


@@ -46,7 +46,8 @@ endef
 
 define KernelPackage/batgat
 $(call Package/batmand/Default)
 
 define KernelPackage/batgat
 $(call Package/batmand/Default)

-  DEPENDS:=batmand
+  SUBMENU:=Network Support
+  DEPENDS:=+batmand

   TITLE:=B.A.T.M.A.N. gateway module
   FILES:=$(PKG_KMOD_BUILD_DIR)/batgat.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,batgat)
   TITLE:=B.A.T.M.A.N. gateway module
   FILES:=$(PKG_KMOD_BUILD_DIR)/batgat.$(LINUX_KMOD_SUFFIX)
   AUTOLOAD:=$(call AutoLoad,50,batgat)


@@ -54,7 +55,7 @@ endef
 
 
 define KernelPackage/batgat/description
 
 
 define KernelPackage/batgat/description

-Kernel gateway module for B.A.T.M.A.N.
+ Kernel gateway module for B.A.T.M.A.N.

 endef
 
 MAKE_ARGS += \
 endef
 
 MAKE_ARGS += \