From e8ec3763c8108ce2ed4cb1ed5e4247c496960b6f Mon Sep 17 00:00:00 2001 From: Abdoulaye Walsimou Gaye Date: Sun, 21 Nov 2010 11:41:08 +0100 Subject: Fix menu usage for better embtk integration and fix remaining kconfig symbols Signed-off-by: Abdoulaye Walsimou Gaye --- busybox-archival.kconfig | 5 ++-- busybox-console-tools.kconfig | 5 ++-- busybox-coreutils.kconfig | 5 ++-- busybox-debianutils.kconfig | 5 ++-- busybox-e2fsprogs-old_e2fsprogs.kconfig | 5 ++-- busybox-e2fsprogs.kconfig | 5 ++-- busybox-editors.kconfig | 5 ++-- busybox-findutils.kconfig | 5 ++-- busybox-init.kconfig | 5 ++-- busybox-libbb.kconfig | 5 ++-- busybox-loginutils.kconfig | 5 ++-- busybox-mailutils.kconfig | 5 ++-- busybox-miscutils.kconfig | 5 ++-- busybox-modutils.kconfig | 19 ++++++++------- busybox-networking.kconfig | 7 +++--- busybox-printutils.kconfig | 5 ++-- busybox-procps.kconfig | 5 ++-- busybox-runit.kconfig | 5 ++-- busybox-selinux.kconfig | 11 +++++---- busybox-shell.kconfig | 5 ++-- busybox-sysklogd.kconfig | 5 ++-- busybox-util-linux.kconfig | 5 ++-- busybox.kconfig | 43 ++++++++++++++++++--------------- 23 files changed, 100 insertions(+), 75 deletions(-) diff --git a/busybox-archival.kconfig b/busybox-archival.kconfig index 4f16736..401fb78 100644 --- a/busybox-archival.kconfig +++ b/busybox-archival.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Archival Utilities" +comment "-------------------------------------------------" +comment "----- Archival Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_FEATURE_SEAMLESS_LZMA bool "Make tar, rpm, modprobe etc understand .lzma data" @@ -261,4 +263,3 @@ config KEMBTK_BUSYB_UNZIP current directory. Use the `-d' option to extract to a directory of your choice. -endmenu diff --git a/busybox-console-tools.kconfig b/busybox-console-tools.kconfig index a1a72f7..81aa159 100644 --- a/busybox-console-tools.kconfig +++ b/busybox-console-tools.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Console Utilities" +comment "-------------------------------------------------" +comment "----- Console Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_CHVT bool "chvt" @@ -117,4 +119,3 @@ config KEMBTK_BUSYB_SHOWKEY help Shows keys pressed. -endmenu diff --git a/busybox-coreutils.kconfig b/busybox-coreutils.kconfig index ef1ce28..aaf16fd 100644 --- a/busybox-coreutils.kconfig +++ b/busybox-coreutils.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Coreutils" +comment "-------------------------------------------------" +comment "----- Coreutils" +comment "-------------------------------------------------" config KEMBTK_BUSYB_BASENAME bool "basename" @@ -725,4 +727,3 @@ config KEMBTK_BUSYB_FEATURE_MD5_SHA1_SUM_CHECK -s and -w are useful options when verifying checksums. -endmenu diff --git a/busybox-debianutils.kconfig b/busybox-debianutils.kconfig index 1080fb7..88179d6 100644 --- a/busybox-debianutils.kconfig +++ b/busybox-debianutils.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Debian Utilities" +comment "-------------------------------------------------" +comment "----- Debian Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_MKTEMP bool "mktemp" @@ -71,5 +73,4 @@ config KEMBTK_BUSYB_WHICH which is used to find programs in your PATH and print out their pathnames. -endmenu diff --git a/busybox-e2fsprogs-old_e2fsprogs.kconfig b/busybox-e2fsprogs-old_e2fsprogs.kconfig index 028e3d7..aa3c8f1 100644 --- a/busybox-e2fsprogs-old_e2fsprogs.kconfig +++ b/busybox-e2fsprogs-old_e2fsprogs.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Linux Ext2 FS Progs" +comment "-------------------------------------------------" +comment "----- Linux Ext2 FS Progs" +comment "-------------------------------------------------" config KEMBTK_BUSYB_CHATTR bool "chattr" @@ -56,4 +58,3 @@ config KEMBTK_BUSYB_FINDFS findfs will search the disks in the system looking for a filesystem which has a label matching label or a UUID equal to uuid. -endmenu diff --git a/busybox-e2fsprogs.kconfig b/busybox-e2fsprogs.kconfig index ee232b9..bae2113 100644 --- a/busybox-e2fsprogs.kconfig +++ b/busybox-e2fsprogs.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Linux Ext2 FS Progs" +comment "-------------------------------------------------" +comment "----- Linux Ext2 FS Progs" +comment "-------------------------------------------------" config KEMBTK_BUSYB_CHATTR bool "chattr" @@ -57,4 +59,3 @@ config KEMBTK_BUSYB_LSATTR ### findfs will search the disks in the system looking for a filesystem ### which has a label matching label or a UUID equal to uuid. -endmenu diff --git a/busybox-editors.kconfig b/busybox-editors.kconfig index 2fa3759..9ec5610 100644 --- a/busybox-editors.kconfig +++ b/busybox-editors.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Editors" +comment "-------------------------------------------------" +comment "----- Editors" +comment "-------------------------------------------------" config KEMBTK_BUSYB_AWK bool "awk" @@ -184,4 +186,3 @@ config KEMBTK_BUSYB_FEATURE_ALLOW_EXEC Enables vi and awk features which allows user to execute shell commands (using system() C call). -endmenu diff --git a/busybox-findutils.kconfig b/busybox-findutils.kconfig index 34f8dad..ef0112f 100644 --- a/busybox-findutils.kconfig +++ b/busybox-findutils.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Finding Utilities" +comment "-------------------------------------------------" +comment "----- Finding Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_FIND bool "find" @@ -235,4 +237,3 @@ config KEMBTK_BUSYB_FEATURE_XARGS_SUPPORT_ZERO_TERM instead of by whitespace, and the quotes and backslash are not special. -endmenu diff --git a/busybox-init.kconfig b/busybox-init.kconfig index 583c568..d6732e9 100644 --- a/busybox-init.kconfig +++ b/busybox-init.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Init Utilities" +comment "-------------------------------------------------" +comment "----- Init Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_INIT bool "init" @@ -93,4 +95,3 @@ config KEMBTK_BUSYB_MESG Mesg controls access to your terminal by others. It is typically used to allow or disallow other users to write to your terminal -endmenu diff --git a/busybox-libbb.kconfig b/busybox-libbb.kconfig index 95a194d..339e525 100644 --- a/busybox-libbb.kconfig +++ b/busybox-libbb.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Busybox Library Tuning" +comment "-------------------------------------------------" +comment "----- Busybox Library Tuning" +comment "-------------------------------------------------" config KEMBTK_BUSYB_PASSWORD_MINLEN int "Minimum password length" @@ -142,4 +144,3 @@ config KEMBTK_BUSYB_FEATURE_HWIB help Support for printing infiniband addresses in network applets. -endmenu diff --git a/busybox-loginutils.kconfig b/busybox-loginutils.kconfig index 901741b..c99e66e 100644 --- a/busybox-loginutils.kconfig +++ b/busybox-loginutils.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Login/Password Management Utilities" +comment "-------------------------------------------------" +comment "----- Login/Password Management Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_FEATURE_SHADOWPASSWDS bool "Support for shadow passwords" @@ -258,4 +260,3 @@ config KEMBTK_BUSYB_VLOCK Note that Busybox binary must be setuid root for this applet to work properly. -endmenu diff --git a/busybox-mailutils.kconfig b/busybox-mailutils.kconfig index 57fff2b..d27ba76 100644 --- a/busybox-mailutils.kconfig +++ b/busybox-mailutils.kconfig @@ -1,4 +1,6 @@ -menu "Mail Utilities" +comment "-------------------------------------------------" +comment "----- Mail Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_MAKEMIME bool "makemime" @@ -60,4 +62,3 @@ config KEMBTK_BUSYB_FEATURE_SENDMAIL_MAILXX Allow to specify Cc: addresses and some additional headers: Errors-To: -endmenu diff --git a/busybox-miscutils.kconfig b/busybox-miscutils.kconfig index 3bb9d05..249333d 100644 --- a/busybox-miscutils.kconfig +++ b/busybox-miscutils.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Miscellaneous Utilities" +comment "-------------------------------------------------" +comment "----- Miscellaneous Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_ADJTIMEX bool "adjtimex" @@ -494,4 +496,3 @@ config KEMBTK_BUSYB_WATCHDOG certain amount of time, the watchdog device assumes the system has hung, and will cause the hardware to reboot. -endmenu diff --git a/busybox-modutils.kconfig b/busybox-modutils.kconfig index 621b131..3502200 100644 --- a/busybox-modutils.kconfig +++ b/busybox-modutils.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Linux Module Utilities" +comment "-------------------------------------------------" +comment "----- Linux Module Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_DEFAULT_MODULES_DIR string "Default directory containing modules" @@ -67,19 +69,19 @@ config KEMBTK_BUSYB_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED config KEMBTK_BUSYB_INSMOD bool "insmod" - depends on !MODPROBE_SMALL + depends on !KEMBTK_BUSYB_MODPROBE_SMALL help insmod is used to load specified modules in the running kernel. config KEMBTK_BUSYB_RMMOD bool "rmmod" - depends on !MODPROBE_SMALL + depends on !KEMBTK_BUSYB_MODPROBE_SMALL help rmmod is used to unload specified modules from the kernel. config KEMBTK_BUSYB_LSMOD bool "lsmod" - depends on !MODPROBE_SMALL + depends on !KEMBTK_BUSYB_MODPROBE_SMALL help lsmod is used to display a list of loaded modules. @@ -93,7 +95,7 @@ config KEMBTK_BUSYB_FEATURE_LSMOD_PRETTY_2_6_OUTPUT config KEMBTK_BUSYB_MODPROBE bool "modprobe" - depends on !MODPROBE_SMALL + depends on !KEMBTK_BUSYB_MODPROBE_SMALL help Handle the loading of modules, and their dependencies on a high level. @@ -114,7 +116,7 @@ config KEMBTK_BUSYB_FEATURE_MODPROBE_BLACKLIST config KEMBTK_BUSYB_DEPMOD bool "depmod" - depends on !MODPROBE_SMALL + depends on !KEMBTK_BUSYB_MODPROBE_SMALL help depmod generates modules.dep (and potentially modules.alias and modules.symbols) that contain dependency information @@ -169,7 +171,7 @@ config KEMBTK_BUSYB_FEATURE_INSMOD_LOAD_MAP config KEMBTK_BUSYB_FEATURE_INSMOD_LOAD_MAP_FULL bool "Symbols in load map" default y - depends on KEMBTK_BUSYB_FEATURE_INSMOD_LOAD_MAP && !MODPROBE_SMALL + depends on KEMBTK_BUSYB_FEATURE_INSMOD_LOAD_MAP && !KEMBTK_BUSYB_MODPROBE_SMALL help Without this option, -m will only output section load map. With this option, -m will also output @@ -178,7 +180,7 @@ config KEMBTK_BUSYB_FEATURE_INSMOD_LOAD_MAP_FULL config KEMBTK_BUSYB_FEATURE_CHECK_TAINTED_MODULE bool "Support tainted module checking with new kernels" default y - depends on !MODPROBE_SMALL + depends on !KEMBTK_BUSYB_MODPROBE_SMALL help Support checking for tainted modules. These are usually binary only modules that will make the linux-kernel list ignore your @@ -212,4 +214,3 @@ config KEMBTK_BUSYB_FEATURE_MODUTILS_SYMBOLS Say Y if unsure. -endmenu diff --git a/busybox-networking.kconfig b/busybox-networking.kconfig index 911d5eb..1f966e3 100644 --- a/busybox-networking.kconfig +++ b/busybox-networking.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Networking Utilities" +comment "-------------------------------------------------" +comment "----- Networking Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_FEATURE_IPV6 bool "Enable KEMBTK_BUSYB_IPv6 support" @@ -318,7 +320,7 @@ config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP_BUILTIN config KEMBTK_BUSYB_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN bool "Use busybox ifconfig and route applets" default y - depends on KEMBTK_BUSYB_IFUPDOWN && !FEATURE_IFUPDOWN_IP + depends on KEMBTK_BUSYB_IFUPDOWN && !KEMBTK_BUSYB_FEATURE_IFUPDOWN_IP select KEMBTK_BUSYB_IFCONFIG select KEMBTK_BUSYB_ROUTE help @@ -840,4 +842,3 @@ config KEMBTK_BUSYB_UDPSVD udpsvd listens on an UDP port and runs a program for each new connection. -endmenu diff --git a/busybox-printutils.kconfig b/busybox-printutils.kconfig index 8965d0a..e511c9b 100644 --- a/busybox-printutils.kconfig +++ b/busybox-printutils.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Print Utilities" +comment "-------------------------------------------------" +comment "----- Print Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_LPD bool "lpd" @@ -20,4 +22,3 @@ config KEMBTK_BUSYB_LPQ help lpq is a print spool queue examination and manipulation program. -endmenu diff --git a/busybox-procps.kconfig b/busybox-procps.kconfig index 0a728ba..8a5a50e 100644 --- a/busybox-procps.kconfig +++ b/busybox-procps.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Process Utilities" +comment "-------------------------------------------------" +comment "----- Process Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_FREE bool "free" @@ -173,4 +175,3 @@ config KEMBTK_BUSYB_WATCH output to the screen. -endmenu diff --git a/busybox-runit.kconfig b/busybox-runit.kconfig index 29ce58f..9b4c443 100644 --- a/busybox-runit.kconfig +++ b/busybox-runit.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Runit Utilities" +comment "-------------------------------------------------" +comment "----- Runit Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_RUNSV bool "runsv" @@ -74,4 +76,3 @@ config KEMBTK_BUSYB_SOFTLIMIT help Sets soft resource limits as specified by options -endmenu diff --git a/busybox-selinux.kconfig b/busybox-selinux.kconfig index dac8391..92c7b43 100644 --- a/busybox-selinux.kconfig +++ b/busybox-selinux.kconfig @@ -3,8 +3,11 @@ # see scripts/kbuild/config-language.txt. # -menu "SELinux Utilities" - depends on KEMBTK_BUSYB_SELINUX + +if KEMBTK_BUSYB_SELINUX +comment "-------------------------------------------------" +comment "----- SELinux Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_CHCON bool "chcon" @@ -105,6 +108,4 @@ config KEMBTK_BUSYB_SESTATUS depends on KEMBTK_BUSYB_SELINUX help Displays the status of SELinux. - -endmenu - +endif diff --git a/busybox-shell.kconfig b/busybox-shell.kconfig index bc2a889..73d355d 100644 --- a/busybox-shell.kconfig +++ b/busybox-shell.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Shells" +comment "-------------------------------------------------" +comment "----- Shells" +comment "-------------------------------------------------" choice prompt "Choose your default shell" @@ -319,4 +321,3 @@ config KEMBTK_BUSYB_CTTYHACK ::respawn:/bin/cttyhack /bin/sh -endmenu diff --git a/busybox-sysklogd.kconfig b/busybox-sysklogd.kconfig index 5cf29e5..ce6a4af 100644 --- a/busybox-sysklogd.kconfig +++ b/busybox-sysklogd.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "System Logging Utilities" +comment "-------------------------------------------------" +comment "----- System Logging Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_SYSLOGD bool "syslogd" @@ -106,5 +108,4 @@ config KEMBTK_BUSYB_LOGGER they can be logged. This is generally used to help locate problems that occur within programs and scripts. -endmenu diff --git a/busybox-util-linux.kconfig b/busybox-util-linux.kconfig index fad9a88..917f8a5 100644 --- a/busybox-util-linux.kconfig +++ b/busybox-util-linux.kconfig @@ -3,7 +3,9 @@ # see scripts/kbuild/config-language.txt. # -menu "Linux System Utilities" +comment "-------------------------------------------------" +comment "----- Linux System Utilities" +comment "-------------------------------------------------" config KEMBTK_BUSYB_BLKID bool "blkid" @@ -756,4 +758,3 @@ config KEMBTK_BUSYB_FEATURE_MTAB_SUPPORT About the only reason to use this is if you've removed /proc from your kernel. -endmenu diff --git a/busybox.kconfig b/busybox.kconfig index 50894e6..1f22ad2 100644 --- a/busybox.kconfig +++ b/busybox.kconfig @@ -3,13 +3,17 @@ # see scripts/kbuild/config-language.txt. # + config KEMBTK_BUSYB_HAVE_DOT_CONFIG bool default y - -menu "Busybox Settings" - -menu "General Configuration" +comment "----------------------------------------------------------------------" +comment "------------------------ Busybox Settings ------------------" +comment "----------------------------------------------------------------------" +comment "" +comment "-------------------------------------------------" +comment "----- General Configuration" +comment "-------------------------------------------------" config KEMBTK_BUSYB_DESKTOP bool "Enable options for full-blown desktop systems" @@ -252,9 +256,9 @@ config KEMBTK_BUSYB_FEATURE_HAVE_RPC # This is automatically selected if any of enabled applets need it. # You do not need to select it manually. -endmenu - -menu 'Build Options' +comment "-------------------------------------------------" +comment "----- Build Options" +comment "-------------------------------------------------" config KEMBTK_BUSYB_STATIC bool "Build BusyBox as a static binary (no shared libs)" @@ -271,7 +275,7 @@ config KEMBTK_BUSYB_STATIC config KEMBTK_BUSYB_PIE bool "Build BusyBox as a position independent executable" - depends on !STATIC + depends on !KEMBTK_BUSYB_STATIC help (TODO: what is it and why/when is it useful?) Most people will leave this set to 'N'. @@ -290,7 +294,7 @@ config KEMBTK_BUSYB_NOMMU # build system does not support that config KEMBTK_BUSYB_BUILD_LIBBUSYBOX bool "Build shared libbusybox" - depends on !FEATURE_PREFER_APPLETS && !PIE && !STATIC + depends on !KEMBTK_BUSYB_FEATURE_PREFER_APPLETS && !KEMBTK_BUSYB_PIE && !KEMBTK_BUSYB_STATIC help Build a shared library libbusybox.so.N.N.N which contains all busybox code. @@ -375,7 +379,7 @@ config KEMBTK_BUSYB_LFS than 2 Gigabytes, enable this option. Otherwise, leave it set to 'N'. config KEMBTK_BUSYB_CROSS_COMPILER_PREFIX - string "Cross Compiler prefix" + string default "" help If you want to build BusyBox with a cross compiler, then you @@ -387,9 +391,9 @@ config KEMBTK_BUSYB_CROSS_COMPILER_PREFIX Native builds leave this empty. -endmenu - -menu 'Debugging Options' +comment "-------------------------------------------------" +comment "----- Debugging Options" +comment "-------------------------------------------------" config KEMBTK_BUSYB_DEBUG bool "Build BusyBox with extra Debugging symbols" @@ -471,9 +475,9 @@ config KEMBTK_BUSYB_INCLUDE_SUSv2 ### config PARSE ### bool "Uniform config file parser debugging applet: parse" -endmenu - -menu 'Installation Options' +comment "-------------------------------------------------" +comment "----- Installation Options:" +comment "-------------------------------------------------" config KEMBTK_BUSYB_INSTALL_NO_USR bool "Don't use /usr" @@ -543,13 +547,12 @@ config KEMBTK_BUSYB_PREFIX help Define your directory to install BusyBox files/subdirs in. -endmenu source packages/busybox/busybox-kconfigs/busybox-libbb.kconfig -endmenu - -comment "Applets" +comment "-------------------------------------------------" +comment "----- Applets" +comment "-------------------------------------------------" source packages/busybox/busybox-kconfigs/busybox-archival.kconfig source packages/busybox/busybox-kconfigs/busybox-coreutils.kconfig -- cgit v1.2.3