From e53ecb012ec4b2b87bb9ab35741241590b552a68 Mon Sep 17 00:00:00 2001 From: nico Date: Mon, 25 May 2009 17:15:39 +0000 Subject: [package] busybox: update to v1.13.4 (closes: #4279) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16063 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- package/busybox/config/modutils/Config.in | 244 +++++++++++++----------------- 1 file changed, 101 insertions(+), 143 deletions(-) (limited to 'package/busybox/config/modutils') diff --git a/package/busybox/config/modutils/Config.in b/package/busybox/config/modutils/Config.in index be141d91c..f02f03178 100644 --- a/package/busybox/config/modutils/Config.in +++ b/package/busybox/config/modutils/Config.in @@ -5,6 +5,20 @@ menu "Linux Module Utilities" +config BUSYBOX_CONFIG_DEFAULT_MODULES_DIR + string "Default directory containing modules" + default "/lib/modules" + help + Directory that contains kernel modules. + Defaults to "/lib/modules" + +config BUSYBOX_CONFIG_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_CONFIG_MODPROBE_SMALL bool "Simplified modutils" default n @@ -54,48 +68,83 @@ config BUSYBOX_CONFIG_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED Check if the module is already loaded. N.B. It's racy. -config BUSYBOX_CONFIG_DEPMOD - bool "depmod" - default n +config BUSYBOX_CONFIG_INSMOD + bool "insmod" + default y depends on !BUSYBOX_CONFIG_MODPROBE_SMALL help - depmod generates modules.dep (FIXME: elaborate) + insmod is used to load specified modules in the running kernel. -config BUSYBOX_CONFIG_FEATURE_DEPMOD_PRUNE_FANCY - bool "Fancy dependency pruning" - default n - depends on BUSYBOX_CONFIG_DEPMOD +config BUSYBOX_CONFIG_RMMOD + bool "rmmod" + default y + depends on !BUSYBOX_CONFIG_MODPROBE_SMALL help - By default modules.dep contains all dependencies as listed by - the modules. - If you enable this option then we remove implied modules from - the dependencies. - This makes depmod somewhat bigger but generates a smaller - modules.dep file. + rmmod is used to unload specified modules from the kernel. - If unsure, say N. +config BUSYBOX_CONFIG_LSMOD + bool "lsmod" + default y + depends on !BUSYBOX_CONFIG_MODPROBE_SMALL + help + lsmod is used to display a list of loaded modules. + +config BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT + bool "Pretty output" + default y + depends on BUSYBOX_CONFIG_LSMOD + help + This option makes output format of lsmod adjusted to + the format of module-init-tools for Linux kernel 2.6. + Increases size somewhat. -config BUSYBOX_CONFIG_FEATURE_DEPMOD_ALIAS - bool "Alias support" +config BUSYBOX_CONFIG_MODPROBE + bool "modprobe" default n - depends on BUSYBOX_CONFIG_DEPMOD + depends on !BUSYBOX_CONFIG_MODPROBE_SMALL help - By default modules.dep does not contain alias information. - Enable this to emit aliases of the form: + Handle the loading of modules, and their dependencies on a high + level. - alias pcmcia:m*c*f03fn*pfn*pa*pb*pc*pd* parport_cs + Note that in the state, modprobe does not understand multiple + module options from the configuration file. See option below. -config BUSYBOX_CONFIG_INSMOD - bool "insmod" - default y +config BUSYBOX_CONFIG_FEATURE_MODPROBE_BLACKLIST + bool + prompt "Blacklist support" + default n + depends on BUSYBOX_CONFIG_MODPROBE + help + Say 'y' here to enable support for the 'blacklist' command in + modprobe.conf. This prevents the alias resolver to resolve + blacklisted modules. This is useful if you want to prevent your + hardware autodetection scripts to load modules like evdev, frame + buffer drivers etc. + +config BUSYBOX_CONFIG_DEPMOD + bool "depmod" + default n depends on !BUSYBOX_CONFIG_MODPROBE_SMALL help - insmod is used to load specified modules in the running kernel. + depmod generates modules.dep (and potentially modules.alias + and modules.symbols) that contain dependency information + for modprobe. + +comment "Options common to multiple modutils" + +config BUSYBOX_CONFIG_FEATURE_2_4_MODULES + bool "Support version 2.2/2.4 Linux kernels" + default n + depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_LSMOD + help + Support module loading for 2.2.x and 2.4.x Linux kernels. + This increases size considerably. Say N unless you plan + to run ancient kernels. config BUSYBOX_CONFIG_FEATURE_INSMOD_VERSION_CHECKING - bool "Module version checking" + bool "Enable module version checking" default n - depends on BUSYBOX_CONFIG_INSMOD && BUSYBOX_CONFIG_FEATURE_2_4_MODULES + depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && (BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE) help Support checking of versions for modules. This is used to ensure that the kernel and module are made for each other. @@ -103,7 +152,7 @@ config BUSYBOX_CONFIG_FEATURE_INSMOD_VERSION_CHECKING config BUSYBOX_CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS bool "Add module symbols to kernel symbol table" default n - depends on BUSYBOX_CONFIG_INSMOD && BUSYBOX_CONFIG_FEATURE_2_4_MODULES + depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && (BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE) help By adding module symbols to the kernel symbol table, Oops messages occuring within kernel modules can be properly debugged. By enabling @@ -114,7 +163,7 @@ config BUSYBOX_CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS config BUSYBOX_CONFIG_FEATURE_INSMOD_LOADINKMEM bool "In kernel memory optimization (uClinux only)" default n - depends on BUSYBOX_CONFIG_INSMOD && BUSYBOX_CONFIG_FEATURE_2_4_MODULES + depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && (BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_MODPROBE) help This is a special uClinux only memory optimization that lets insmod load the specified kernel module directly into kernel space, reducing @@ -122,9 +171,9 @@ config BUSYBOX_CONFIG_FEATURE_INSMOD_LOADINKMEM being loaded into memory. config BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP - bool "Enable load map (-m) option" + bool "Enable insmod load map (-m) option" default n - depends on BUSYBOX_CONFIG_INSMOD && ( BUSYBOX_CONFIG_FEATURE_2_4_MODULES || BUSYBOX_CONFIG_FEATURE_2_6_MODULES ) + depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && BUSYBOX_CONFIG_INSMOD help Enabling this, one would be able to get a load map output on stdout. This makes kernel module debugging @@ -135,138 +184,47 @@ config BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP config BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL bool "Symbols in load map" default n - depends on BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP + depends on BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP && !BUSYBOX_CONFIG_MODPROBE_SMALL help Without this option, -m will only output section load map. With this option, -m will also output symbols load map. -config BUSYBOX_CONFIG_RMMOD - bool "rmmod" - default y - depends on !BUSYBOX_CONFIG_MODPROBE_SMALL - help - rmmod is used to unload specified modules from the kernel. - -config BUSYBOX_CONFIG_LSMOD - bool "lsmod" - default y - depends on !BUSYBOX_CONFIG_MODPROBE_SMALL - help - lsmod is used to display a list of loaded modules. - -config BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT - bool "Pretty output for 2.6.x Linux kernels" - default y - depends on BUSYBOX_CONFIG_LSMOD - help - This option makes output format of lsmod adjusted to - the format of module-init-tools for Linux kernel 2.6. - -config BUSYBOX_CONFIG_MODPROBE - bool "modprobe" - default n - depends on !BUSYBOX_CONFIG_MODPROBE_SMALL - help - 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_CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS - bool - prompt "Multiple options parsing" - default n - depends on BUSYBOX_CONFIG_MODPROBE - help - Allow modprobe to understand more than one option to pass to - modules. - - This is a WIP, while waiting for a common argument parsing - common amongst all BB applets (shell, modprobe, etc...) and - adds around 600 bytes on x86, 700 bytes on ARM. The code is - biggish and uggly, but just works. - - Saying Y here is not a bad idea if you're not that short - on storage capacity. - -config BUSYBOX_CONFIG_FEATURE_MODPROBE_FANCY_ALIAS - bool - prompt "Fancy alias parsing" - default n - depends on BUSYBOX_CONFIG_MODPROBE && BUSYBOX_CONFIG_FEATURE_2_6_MODULES - help - Say 'y' here to enable parsing of aliases with underscore/dash - mismatch between module name and file name, along with bus-specific - aliases (such as pci:... or usb:... aliases). - -config BUSYBOX_CONFIG_FEATURE_MODPROBE_BLACKLIST - bool - prompt "Blacklist support" - default n - depends on BUSYBOX_CONFIG_MODPROBE && BUSYBOX_CONFIG_FEATURE_2_6_MODULES - help - Say 'y' here to enable support for the 'blacklist' command in - modprobe.conf. This prevents the alias resolver to resolve - blacklisted modules. This is useful if you want to prevent your - hardware autodetection scripts to load modules like evdev, frame - buffer drivers etc. - -comment "Options common to multiple modutils" - depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_LSMOD || BUSYBOX_CONFIG_DEPMOD - config BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE - # Simulate indentation bool "Support tainted module checking with new kernels" default y - depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_LSMOD + depends on !BUSYBOX_CONFIG_MODPROBE_SMALL help Support checking for tainted modules. These are usually binary only modules that will make the linux-kernel list ignore your support request. This option is required to support GPLONLY modules. -config BUSYBOX_CONFIG_FEATURE_2_4_MODULES - # Simulate indentation - bool "Support version 2.2.x to 2.4.x Linux kernels" +config BUSYBOX_CONFIG_FEATURE_MODUTILS_ALIAS + bool "Support for module.aliases file" default n - depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE + depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_MODPROBE help - Support module loading for 2.2.x and 2.4.x Linux kernels. + Generate and parse modules.alias containing aliases for bus + identifiers: + alias pcmcia:m*c*f03fn*pfn*pa*pb*pc*pd* parport_cs - Note: - This is automatically enabled if 2.6 modules are not enabled. + and aliases for logical modules names e.g.: + alias padlock_aes aes + alias aes_i586 aes + alias aes_generic aes -config BUSYBOX_CONFIG_FEATURE_2_6_MODULES - # Simulate indentation - bool "Support version 2.6.x Linux kernels" - default y - depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE - help - Support module loading for newer 2.6.x Linux kernels. - -config BUSYBOX_CONFIG_DEFAULT_MODULES_DIR - # Simulate indentation - string "Default directory containing modules" - default "/lib/modules" - depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_MODPROBE_SMALL || BUSYBOX_CONFIG_DEPMOD - help - Directory that contains kernel modules. - Defaults to "/lib/modules" + Say Y if unsure. -config BUSYBOX_CONFIG_DEFAULT_DEPMOD_FILE - # Simulate indentation - string "Default name of modules.dep" - default "modules.dep" - depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE || BUSYBOX_CONFIG_MODPROBE_SMALL || BUSYBOX_CONFIG_DEPMOD +config BUSYBOX_CONFIG_FEATURE_MODUTILS_SYMBOLS + bool "Support for module.symbols file" + default n + depends on BUSYBOX_CONFIG_DEPMOD || BUSYBOX_CONFIG_MODPROBE help - Filename that contains kernel modules dependencies. - Defaults to "modules.dep" + Generate and parse modules.symbols containing aliases for + symbol_request() kernel calls, such as: + alias symbol:usb_sg_init usbcore -config BUSYBOX_CONFIG_FEATURE_QUERY_MODULE_INTERFACE - bool - default n - depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && !BUSYBOX_CONFIG_FEATURE_2_6_MODULES + Say Y if unsure. endmenu -- cgit v1.2.3