X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/f77b88d124ea1c900f9cf5e04046939aad48bbe1..7196f4da13523994b276518dd12fbe8edfdfff56:/package/busybox/config/modutils/Config.in?ds=inline

diff --git a/package/busybox/config/modutils/Config.in b/package/busybox/config/modutils/Config.in
index 536236b7c..63a3f71fb 100644
--- a/package/busybox/config/modutils/Config.in
+++ b/package/busybox/config/modutils/Config.in
@@ -5,28 +5,44 @@
 
 menu "Linux Module Utilities"
 
-config BUSYBOX_CONFIG_INSMOD
-	bool "insmod"
-	default y
+config BUSYBOX_CONFIG_DEPMOD
+	bool "depmod"
+	default n
 	help
-	  insmod is used to load specified modules in the running kernel.
+	  depmod generates modules.dep (FIXME: elaborate)
 
-config BUSYBOX_CONFIG_FEATURE_2_4_MODULES
-	bool "  Support version 2.2.x to 2.4.x Linux kernels"
-	default y
-	depends on BUSYBOX_CONFIG_INSMOD
+config BUSYBOX_CONFIG_FEATURE_DEPMOD_PRUNE_FANCY
+	bool "fancy dependency pruning"
+	default n
+	depends on BUSYBOX_CONFIG_DEPMOD
 	help
-	  Support module loading for 2.2.x and 2.4.x Linux kernels.
+	  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.
 
-config BUSYBOX_CONFIG_FEATURE_2_6_MODULES
-	bool "  Support version 2.6.x Linux kernels"
+	  If unsure, say N.
+
+config BUSYBOX_CONFIG_FEATURE_DEPMOD_ALIAS
+	bool "alias support"
 	default n
-	depends on BUSYBOX_CONFIG_INSMOD
+	depends on BUSYBOX_CONFIG_DEPMOD
 	help
-	  Support module loading for newer 2.6.x Linux kernels.
+	  By default modules.dep does not contain alias information.
+	  Enable this to emit aliases of the form:
+
+	    alias pcmcia:m*c*f03fn*pfn*pa*pb*pc*pd* parport_cs
+
+config BUSYBOX_CONFIG_INSMOD
+	bool "insmod"
+	default y
+	help
+	  insmod is used to load specified modules in the running kernel.
 
 config BUSYBOX_CONFIG_FEATURE_INSMOD_VERSION_CHECKING
-	bool "  Module version checking"
+	bool "Module version checking"
 	default n
 	depends on BUSYBOX_CONFIG_INSMOD && BUSYBOX_CONFIG_FEATURE_2_4_MODULES
 	help
@@ -34,7 +50,7 @@ config BUSYBOX_CONFIG_FEATURE_INSMOD_VERSION_CHECKING
 	  ensure that the kernel and module are made for each other.
 
 config BUSYBOX_CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
-	bool "  Add module symbols to kernel symbol table"
+	bool "Add module symbols to kernel symbol table"
 	default n
 	depends on BUSYBOX_CONFIG_INSMOD && BUSYBOX_CONFIG_FEATURE_2_4_MODULES
 	help
@@ -45,7 +61,7 @@ config BUSYBOX_CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS
 	  Oops messages from kernel modules, say N.
 
 config BUSYBOX_CONFIG_FEATURE_INSMOD_LOADINKMEM
-	bool "  In kernel memory optimization (uClinux only)"
+	bool "In kernel memory optimization (uClinux only)"
 	default n
 	depends on BUSYBOX_CONFIG_INSMOD && BUSYBOX_CONFIG_FEATURE_2_4_MODULES
 	help
@@ -55,9 +71,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 load map (-m) option"
 	default n
-	depends on BUSYBOX_CONFIG_INSMOD && BUSYBOX_CONFIG_FEATURE_2_4_MODULES
+	depends on BUSYBOX_CONFIG_INSMOD && ( BUSYBOX_CONFIG_FEATURE_2_4_MODULES || BUSYBOX_CONFIG_FEATURE_2_6_MODULES )
 	help
 	  Enabling this, one would be able to get a load map
 	  output on stdout. This makes kernel module debugging
@@ -66,7 +82,7 @@ config BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP
 	  don't need this option.
 
 config BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL
-	bool "  Symbols in load map"
+	bool "Symbols in load map"
 	default n
 	depends on BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP
 	help
@@ -74,33 +90,82 @@ config BUSYBOX_CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL
 	  load map.  With this option, -m will also output
 	  symbols load map.
 
+config BUSYBOX_CONFIG_RMMOD
+	bool "rmmod"
+	default y
+	help
+	  rmmod is used to unload specified modules from the kernel.
+
 config BUSYBOX_CONFIG_LSMOD
 	bool "lsmod"
 	default y
 	help
 	  lsmod is used to display a list of loaded modules.
 
-config BUSYBOX_CONFIG_FEATURE_QUERY_MODULE_INTERFACE
-	bool
+config BUSYBOX_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
+	bool "Pretty output for 2.6.x Linux kernels"
 	default y
-	depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && !CONFIG_FEATURE_2_6_MODULES
+	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
 	help
-	  Handle the loading of modules, and their dependancies on a high
+	  Handle the loading of modules, and their dependencies on a high
 	  level.
 
-config BUSYBOX_CONFIG_RMMOD
-	bool "rmmod"
-	default y
+	  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
-	  rmmod is used to unload specified modules from the kernel.
+	  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 n
+	default y
 	depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_LSMOD
 	help
 	  Support checking for tainted modules.  These are usually binary
@@ -108,6 +173,46 @@ config BUSYBOX_CONFIG_FEATURE_CHECK_TAINTED_MODULE
 	  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"
+	default n
+	depends on BUSYBOX_CONFIG_INSMOD || BUSYBOX_CONFIG_RMMOD || BUSYBOX_CONFIG_MODPROBE
+	help
+	  Support module loading for 2.2.x and 2.4.x Linux kernels.
 
-endmenu
+	  Note:
+	  This is automatically enabled if 2.6 modules are not enabled.
+
+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_DEPMOD
+	help
+	  Directory that contains kernel modules.
+	  Defaults to "/lib/modules"
+
+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_DEPMOD
+	help
+	  Filename that contains kernel modules dependencies.
+	  Defaults to "modules.dep"
+
+config BUSYBOX_CONFIG_FEATURE_QUERY_MODULE_INTERFACE
+	bool
+	default n
+	depends on BUSYBOX_CONFIG_FEATURE_2_4_MODULES && !BUSYBOX_CONFIG_FEATURE_2_6_MODULES
+
+endmenu