Move complex packages to their own menu,

Standardize config options

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1036 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/openwrt/package/kismet/Config.in b/openwrt/package/kismet/Config.in
index 36c00cf..3329b01 100644 (file)
--- a/openwrt/package/kismet/Config.in
+++ b/openwrt/package/kismet/Config.in
@@ -1,33 +1,68 @@
+menu "kismet - an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
+

 config BR2_PACKAGE_KISMET
 config BR2_PACKAGE_KISMET

-       bool "kismet - an 802.11 layer2 wireless network detector, sniffer, and intrusion detection system"
-       default y if CONFIG_DEVEL
+       bool

        default n
        default n

+       depends BR2_PACKAGE_KISMET_CLIENT || BR2_PACKAGE_KISMET_DRONE || BR2_PACKAGE_KISMET_SERVER
+
+config BR2_PACKAGE_KISMET_CLIENT
+       prompt "kismet-client - the Kismet client"
+       default m if CONFIG_DEVEL
+       select BR2_PACKAGE_KISMET
+       select BR2_PACKAGE_LIBNCURSES
+       select BR2_PACKAGE_UCLIBCXX

        help
        help

+         

          An 802.11 layer2 wireless network detector, sniffer, and intrusion detection system.
          
          http://www.kismetwireless.net/
          
          An 802.11 layer2 wireless network detector, sniffer, and intrusion detection system.
          
          http://www.kismetwireless.net/
          

-         Depends: libpcap, uClibc++
+         This package contains the kismet text interface client.
+         
+         Depends:
+           - libncurses
+           - libpcap
+           - uClibc++

          
          

-
-config BR2_PACKAGE_KISMET_CLIENT
-       tristate "kismet-client - the Kismet client"
-       default m if CONFIG_DEVEL
-       depends BR2_PACKAGE_KISMET
-       select BR2_PACKAGE_LIBNCURSES
-       select BR2_PACKAGE_UCLIBCXX

 
 config BR2_PACKAGE_KISMET_DRONE
 
 config BR2_PACKAGE_KISMET_DRONE

-       tristate "kismet-drone - the Kismet drone"
+       prompt "kismet-drone - the Kismet drone"
+       tristate

        default m if CONFIG_DEVEL
        default m if CONFIG_DEVEL

-       depends BR2_PACKAGE_KISMET
+       select BR2_PACKAGE_KISMET

        select BR2_PACKAGE_LIBPCAP
        select BR2_PACKAGE_UCLIBCXX
        select BR2_PACKAGE_LIBPCAP
        select BR2_PACKAGE_UCLIBCXX

+       help
+         
+         An 802.11 layer2 wireless network detector, sniffer, and intrusion detection system.
+         
+         http://www.kismetwireless.net/
+         
+         This package contains the kismet remote sniffing.and monitoring drone.
+         
+         Depends:
+           - libpcap
+           - uClibc++
+         

 
 config BR2_PACKAGE_KISMET_SERVER
 
 config BR2_PACKAGE_KISMET_SERVER

-       tristate "kismet-server - the Kismet server"
+       prompt "kismet-server - the Kismet server"
+       tristate

        default m if CONFIG_DEVEL
        default m if CONFIG_DEVEL

-       depends BR2_PACKAGE_KISMET
+       select BR2_PACKAGE_KISMET

        select BR2_PACKAGE_LIBPCAP
        select BR2_PACKAGE_UCLIBCXX
        select BR2_PACKAGE_LIBPCAP
        select BR2_PACKAGE_UCLIBCXX

+       help
+         
+         An 802.11 layer2 wireless network detector, sniffer, and intrusion detection system.
+         
+         http://www.kismetwireless.net/
+         
+         This package contains the kismet server.
+         
+         Depends:
+           - libpcap
+           - uClibc++
+         

 
 

+endmenu

diff --git a/openwrt/package/olsrd/Config.in b/openwrt/package/olsrd/Config.in
index fd0cb93..d508263 100644 (file)
--- a/openwrt/package/olsrd/Config.in
+++ b/openwrt/package/olsrd/Config.in
@@ -1,5 +1,8 @@
+menu "olsrd - OLSR (Optimized Link State Routing) daemon"
+

 config BR2_PACKAGE_OLSRD
 config BR2_PACKAGE_OLSRD

-       tristate "olsrd - OLSR (Optimized Link State Routing) daemon"
+       prompt "olsrd - OLSR (Optimized Link State Routing) daemon"
+       tristate

        default m if CONFIG_DEVEL
        help
          The Optimized Link State Routing daemon
        default m if CONFIG_DEVEL
        help
          The Optimized Link State Routing daemon


@@ -9,37 +12,38 @@ config BR2_PACKAGE_OLSRD
 
 config BR2_PACKAGE_OLSRD_MOD_DOT_DRAW
        depends BR2_PACKAGE_OLSRD
 
 config BR2_PACKAGE_OLSRD_MOD_DOT_DRAW
        depends BR2_PACKAGE_OLSRD

-       prompt "mod-dot-draw - Dot topology information plugin"
+       prompt "...-mod-dot-draw - Dot topology information plugin"

        tristate
        default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_OLSRD_MOD_DYN_GW
        depends BR2_PACKAGE_OLSRD
        tristate
        default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_OLSRD_MOD_DYN_GW
        depends BR2_PACKAGE_OLSRD

-       prompt "mod-dyn-gw - Dynamic internet gateway plugin"
+       prompt "...-mod-dyn-gw - Dynamic internet gateway plugin"

        tristate
        default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_OLSRD_MOD_HTTPINFO
        depends BR2_PACKAGE_OLSRD
        tristate
        default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_OLSRD_MOD_HTTPINFO
        depends BR2_PACKAGE_OLSRD

-       prompt "mod-httpinfo - Small informative web server plugin"
+       prompt "...-mod-httpinfo - Small informative web server plugin"

        tristate
        default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_OLSRD_MOD_NAMESERVICE
        depends BR2_PACKAGE_OLSRD
        tristate
        default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_OLSRD_MOD_NAMESERVICE
        depends BR2_PACKAGE_OLSRD

-       prompt "mod-nameservice - Lightweight hostname resolver plugin"
+       prompt "...-mod-nameservice - Lightweight hostname resolver plugin"

        tristate
        default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_OLSRD_MOD_POWER
        depends BR2_PACKAGE_OLSRD
        tristate
        default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_OLSRD_MOD_POWER
        depends BR2_PACKAGE_OLSRD

-       prompt "mod-power - Power status plugin"
+       prompt "...-mod-power - Power status plugin"

        tristate
        default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_OLSRD_MOD_SECURE
        depends BR2_PACKAGE_OLSRD
        tristate
        default m if CONFIG_DEVEL
 
 config BR2_PACKAGE_OLSRD_MOD_SECURE
        depends BR2_PACKAGE_OLSRD

-       prompt "mod-secure - Message signing plugin to secure olsrd routing domain"
+       prompt "...-mod-secure - Message signing plugin to secure olsrd routing domain"

        tristate
        default m if CONFIG_DEVEL
 
        tristate
        default m if CONFIG_DEVEL
 

+endmenu