From 0c6fb98d013e4ffc664935a51adce94254d10f83 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Fri, 27 Nov 2009 19:33:20 +0100 Subject: update busybox and default config --- package/busybox/config/modutils/Config.in | 42 ++++++++++++++----------------- 1 file changed, 19 insertions(+), 23 deletions(-) (limited to 'package/busybox/config/modutils') diff --git a/package/busybox/config/modutils/Config.in b/package/busybox/config/modutils/Config.in index f168c7e30..82500e18a 100644 --- a/package/busybox/config/modutils/Config.in +++ b/package/busybox/config/modutils/Config.in @@ -5,20 +5,6 @@ menu "Linux Module Utilities" -config BUSYBOX_DEFAULT_MODULES_DIR - string "Default directory containing modules" - default "/lib/modules" - help - Directory that contains kernel modules. - Defaults to "/lib/modules" - -config BUSYBOX_DEFAULT_DEPMOD_FILE - string "Default name of modules.dep" - default "modules.dep" - help - Filename that contains kernel modules dependencies. - Defaults to "modules.dep" - config BUSYBOX_MODPROBE_SMALL bool "Simplified modutils" default n @@ -58,7 +44,6 @@ config BUSYBOX_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE depends on BUSYBOX_MODPROBE_SMALL help Allow insmod and modprobe take module options from command line. - N.B. Very bloaty. config BUSYBOX_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED bool "Skip loading of already loaded modules" @@ -66,7 +51,6 @@ config BUSYBOX_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED depends on BUSYBOX_MODPROBE_SMALL help Check if the module is already loaded. - N.B. It's racy. config BUSYBOX_INSMOD bool "insmod" @@ -106,12 +90,8 @@ config BUSYBOX_MODPROBE Handle the loading of modules, and their dependencies on a high level. - Note that in the state, modprobe does not understand multiple - module options from the configuration file. See option below. - config BUSYBOX_FEATURE_MODPROBE_BLACKLIST - bool - prompt "Blacklist support" + bool "Blacklist support" default n depends on BUSYBOX_MODPROBE help @@ -157,7 +137,7 @@ config BUSYBOX_FEATURE_INSMOD_KSYMOOPS_SYMBOLS By adding module symbols to the kernel symbol table, Oops messages occuring within kernel modules can be properly debugged. By enabling this feature, module symbols will always be added to the kernel symbol - table for properly debugging support. If you are not interested in + table for proper debugging support. If you are not interested in Oops messages from kernel modules, say N. config BUSYBOX_FEATURE_INSMOD_LOADINKMEM @@ -193,7 +173,7 @@ config BUSYBOX_FEATURE_INSMOD_LOAD_MAP_FULL config BUSYBOX_FEATURE_CHECK_TAINTED_MODULE bool "Support tainted module checking with new kernels" default y - depends on !BUSYBOX_MODPROBE_SMALL + depends on (BUSYBOX_LSMOD || BUSYBOX_FEATURE_2_4_MODULES) && !BUSYBOX_MODPROBE_SMALL help Support checking for tainted modules. These are usually binary only modules that will make the linux-kernel list ignore your @@ -227,4 +207,20 @@ config BUSYBOX_FEATURE_MODUTILS_SYMBOLS Say Y if unsure. +config BUSYBOX_DEFAULT_MODULES_DIR + string "Default directory containing modules" + default "/lib/modules" + depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODPROBE_SMALL + help + Directory that contains kernel modules. + Defaults to "/lib/modules" + +config BUSYBOX_DEFAULT_DEPMOD_FILE + string "Default name of modules.dep" + default "modules.dep" + depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODPROBE_SMALL + help + Filename that contains kernel modules dependencies. + Defaults to "modules.dep" + endmenu -- cgit v1.2.3