From 6c9db2ad1012a6340d8b57ddd818817bdf21429a Mon Sep 17 00:00:00 2001 From: kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> Date: Fri, 10 Feb 2006 11:42:07 +0000 Subject: [PATCH] move packages and kernel modules into menus git-svn-id: svn://svn.openwrt.org/openwrt/trunk@3211 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- openwrt/package/Config.in | 32 ++++++++++----- openwrt/target/linux/Config.in | 50 ++++++++++++++++++------ openwrt/target/linux/aruba-2.6/Config.in | 3 +- 3 files changed, 61 insertions(+), 24 deletions(-) diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in index b630c77e7..b2a54b80c 100644 --- a/openwrt/package/Config.in +++ b/openwrt/package/Config.in @@ -2,7 +2,9 @@ menu "OpenWrt Package Selection" -comment "The default set" +comment "Package categories" + +menu "Base system" source "package/busybox/Config.in" source "package/bridge/Config.in" source "package/dnsmasq/Config.in" @@ -10,8 +12,9 @@ source "package/ipkg/Config.in" source "package/iptables/Config.in" source "package/mtd/Config.in" source "package/nvram/Config.in" +endmenu -comment "Applications" +menu "Applications" source "package/collectd/Config.in" source "package/deco/Config.in" source "package/gpsd/Config.in" @@ -39,8 +42,9 @@ source "package/rrdtool1/Config.in" source "package/rrdcollect/Config.in" endmenu source "package/screen/Config.in" +endmenu -comment "Networking" +menu "Networking" source "package/aircrack/Config.in" source "package/amwall/Config.in" source "package/arpd/Config.in" @@ -165,8 +169,9 @@ source "package/wrt-radauth/Config.in" source "package/wx200d/Config.in" source "package/xinetd/Config.in" source "package/xsupplicant/Config.in" +endmenu -comment "IPv6" +menu "IPv6" source "package/6tunnel/Config.in" source "package/aiccu/Config.in" source "package/dhcp6/Config.in" @@ -174,8 +179,9 @@ source "package/miredo/Config.in" source "package/mrd6/Config.in" source "package/ndisc/Config.in" source "package/radvd/Config.in" +endmenu -comment "Libraries" +menu "Libraries" source "package/cgilib/Config.in" source "package/glib/Config.in" source "package/id3lib/Config.in" @@ -237,8 +243,9 @@ source "package/libxslt/Config.in" source "package/uclibc++/Config.in" source "package/ustl/Config.in" source "package/zlib/Config.in" +endmenu -comment "Multimedia" +menu "Multimedia" source "package/gmediaserver/Config.in" source "package/icecast/Config.in" source "package/madplay/Config.in" @@ -247,16 +254,18 @@ source "package/mt-daapd/Config.in" source "package/palantir/Config.in" source "package/peercast/Config.in" source "package/setpwc/Config.in" +endmenu -comment "Serial communications & terminal emulation" +menu "Serial communications & terminal emulation" source "package/heyu/Config.in" source "package/lrzsz/Config.in" source "package/microcom/Config.in" source "package/picocom/Config.in" source "package/serdisplib/Config.in" source "package/setserial/Config.in" +endmenu -comment "Utilities" +menu "Utilities" source "package/bc/Config.in" source "package/gdbserver/Config.in" source "package/pcmcia-cs/Config.in" # pcmcia-utils @@ -265,18 +274,21 @@ source "package/pciutils/Config.in" source "package/strace/Config.in" source "package/udev/Config.in" source "package/watchdog/Config.in" +endmenu -comment "FileSystems related" +menu "FileSystems related" source "package/dosfstools/Config.in" source "package/e2fsprogs/Config.in" source "package/fuse/Config.in" source "package/shfs/Config.in" source "package/util-linux/Config.in" +endmenu -comment "Bluetooth" +menu "Bluetooth" source "package/bluez-libs/Config.in" source "package/bluez-utils/Config.in" source "package/miax/Config.in" +endmenu comment "Extra stuff" source "package/sdk/Config.in" diff --git a/openwrt/target/linux/Config.in b/openwrt/target/linux/Config.in index 46df407a7..1e68eaeb5 100644 --- a/openwrt/target/linux/Config.in +++ b/openwrt/target/linux/Config.in @@ -26,7 +26,9 @@ comment "Device specific configuration" source "target/linux/*-2.[46]/Config.in" -comment "Networking modules" +comment "Kernel modules" + +menu "Networking modules" config BR2_PACKAGE_KMOD_ATM prompt "kmod-atm.......................... ATM support" @@ -105,7 +107,9 @@ config BR2_PACKAGE_KMOD_TUN help Kernel support for the TUN/TAP tunneling device -comment "Filtering/Firewalling" +endmenu + +menu "Filtering/Firewalling" config BR2_PACKAGE_KMOD_ARPTABLES prompt "kmod-arptables.................... ARP firewalling support" @@ -263,7 +267,9 @@ config BR2_PACKAGE_KMOD_IP6TABLES help IPv6 firewalling support -comment "Block devices support" +endmenu + +menu "Block devices support" config BR2_PACKAGE_KMOD_IDE prompt "kmod-ide.......................... IDE support" @@ -288,17 +294,17 @@ config BR2_PACKAGE_KMOD_NBD help Kernel module for network block device -comment "Cryptographic support" +endmenu config BR2_PACKAGE_KMOD_CRYPTO - prompt "kmod-crypto....................... CryptoAPI modules" + prompt "CryptoAPI modules" tristate default m select BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE help Kernel modules for cryptographic algorithms -comment "Filesystems support" +menu "Filesystems support" config BR2_PACKAGE_KMOD_FS_CIFS prompt "kmod-fs-cifs...................... CIFS support" @@ -351,7 +357,9 @@ config BR2_PACKAGE_KMOD_FS_XFS help Kernel modules for XFS filesystem support -comment "Multimedia devices support" +endmenu + +menu "Multimedia devices support" config BR2_PACKAGE_KMOD_PWC prompt "kmod-pwc.......................... Kernel driver for USB Philips Cameras" @@ -372,7 +380,9 @@ config BR2_PACKAGE_KMOD_VIDEODEV tristate default m -comment "Native Language support" +endmenu + +menu "Native Language support" config BR2_PACKAGE_KMOD_NLS_BASE prompt "kmod-nls-base..................... Native Language support" @@ -421,7 +431,10 @@ config BR2_PACKAGE_KMOD_NLS_UTF8 help Kernel native language support -comment "Network devices support" +endmenu + +menu "Network devices support" + depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 config BR2_PACKAGE_KMOD_NET_3C59X prompt "kmod-net-3c59x.................... 3Com 3c590/3c900 series (592/595/597) \"Vortex/Boomerang\" Ethernet kernel support" @@ -561,7 +574,10 @@ config BR2_PACKAGE_KMOD_NET_PRISM54 Note: You need a motherboard with DMA support to use any of these cards. -comment "PCMCIA/CardBus support" +endmenu + +menu "PCMCIA/CardBus support" + depends BR2_LINUX_2_4_X86 || BR2_LINUX_2_6_X86 || BR2_LINUX_2_4_BRCM || BR2_LINUX_2_6_BRCM config BR2_PACKAGE_KMOD_PCMCIA_CORE prompt "kmod-pcmcia-core.................. PCMCIA/CardBus support" @@ -576,7 +592,9 @@ config BR2_PACKAGE_KMOD_PCMCIA_SERIAL default m depends BR2_PACKAGE_KMOD_PCMCIA_CORE -comment "USB support" +endmenu + +menu "USB support" config BR2_PACKAGE_KMOD_USB prompt "kmod-usb-core..................... USB support" @@ -677,7 +695,9 @@ config BR2_PACKAGE_KMOD_USB_ATM default m depends BR2_PACKAGE_KMOD_USB_CONTROLLER -comment "Misc. devices support" +endmenu + +menu "Misc. devices support" config BR2_PACKAGE_KMOD_AX25 prompt "kmod-ax25......................... AX25 support" @@ -719,8 +739,12 @@ config BR2_PACKAGE_KMOD_WD1100 Driver for the NatSemi SC1x00 series Watchdog found on Soekris net4801 boards -comment "Additional kernel modules" +endmenu + +menu "Additional kernel modules" source "target/linux/package/Config.in" endmenu + +endmenu diff --git a/openwrt/target/linux/aruba-2.6/Config.in b/openwrt/target/linux/aruba-2.6/Config.in index a0b58afb1..c1fab5646 100644 --- a/openwrt/target/linux/aruba-2.6/Config.in +++ b/openwrt/target/linux/aruba-2.6/Config.in @@ -1,3 +1,4 @@ config BR2_ARUBA_RAMDISK - prompt "ramdisk" + prompt "ramdisk support" + depends BR2_LINUX_2_6_ARUBA bool -- 2.20.1