From 0820b94a8326b3e8cc75d0078f93c7626ccf8147 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 25 Feb 2021 09:10:55 +0100 Subject: package/busybox: Update stored config files When updating busybox, these files must be updated - otherwise the config written to busybox source tree when building may be incomplete, causing the build to hang. Fixes: e4800c73e63e5 ("busybox: update to latest") Signed-off-by: Phil Sutter --- package/busybox/config/modutils/Config.in | 298 +++++++++++++----------------- 1 file changed, 126 insertions(+), 172 deletions(-) (limited to 'package/busybox/config/modutils') diff --git a/package/busybox/config/modutils/Config.in b/package/busybox/config/modutils/Config.in index 22d554eca..141e5ea85 100644 --- a/package/busybox/config/modutils/Config.in +++ b/package/busybox/config/modutils/Config.in @@ -1,138 +1,98 @@ # DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. +# see docs/Kconfig-language.txt. # menu "Linux Module Utilities" -config BUSYBOX_MODINFO - bool "modinfo" - default n - depends on !BUSYBOX_DISABLE_KMOD - select BUSYBOX_PLATFORM_LINUX - help - Show information about a Linux Kernel module - config BUSYBOX_MODPROBE_SMALL bool "Simplified modutils" - default n - depends on !BUSYBOX_DISABLE_KMOD - select BUSYBOX_PLATFORM_LINUX + default y help - Simplified modutils. - - With this option modprobe does not require modules.dep file - and does not use /etc/modules.conf file. - It scans module files in /lib/modules/`uname -r` and - determines dependencies and module alias names on the fly. - This may make module loading slower, most notably - when one needs to load module by alias (this requires - scanning through module _bodies_). + Build smaller (~1.5 kbytes), simplified module tools. - At the first attempt to load a module by alias modprobe - will try to generate modules.dep.bb file in order to speed up - future loads by alias. Failure to do so (read-only /lib/modules, - etc) is not reported, and future modprobes will be slow too. + This option by itself does not enable any applets - + you need to select applets individually below. - NB: modules.dep.bb file format is not compatible - with modules.dep file as created/used by standard module tools. + With this option modprobe does not require modules.dep file + and does not use /etc/modules.conf file. + It scans module files in /lib/modules/`uname -r` and + determines dependencies and module alias names on the fly. + This may make module loading slower, most notably + when one needs to load module by alias (this requires + scanning through module _bodies_). - Additional module parameters can be stored in - /etc/modules/$module_name files. + At the first attempt to load a module by alias modprobe + will try to generate modules.dep.bb file in order to speed up + future loads by alias. Failure to do so (read-only /lib/modules, + etc) is not reported, and future modprobes will be slow too. - Apart from modprobe, other utilities are also provided: - - insmod is an alias to modprobe - - rmmod is an alias to modprobe -r - - depmod generates modules.dep.bb + NB: modules.dep.bb file format is not compatible + with modules.dep file as created/used by standard module tools. - As of 2008-07, this code is experimental. It is 14kb smaller - than "non-small" modutils. + Additional module parameters can be stored in + /etc/modules/$module_name files. -config BUSYBOX_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE - bool "Accept module options on modprobe command line" +config BUSYBOX_DEPMOD + bool "depmod (27 kb)" default y - depends on BUSYBOX_MODPROBE_SMALL select BUSYBOX_PLATFORM_LINUX help - Allow insmod and modprobe take module options from command line. - -config BUSYBOX_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED - bool "Skip loading of already loaded modules" - default y - depends on BUSYBOX_MODPROBE_SMALL - help - Check if the module is already loaded. - + depmod generates modules.dep (and potentially modules.alias + and modules.symbols) that contain dependency information + for modprobe. config BUSYBOX_INSMOD - bool "insmod" + bool "insmod (22 kb)" default y - depends on !BUSYBOX_MODPROBE_SMALL - depends on !BUSYBOX_DISABLE_KMOD select BUSYBOX_PLATFORM_LINUX help - insmod is used to load specified modules in the running kernel. - -config BUSYBOX_RMMOD - bool "rmmod" - default y - depends on !BUSYBOX_MODPROBE_SMALL - depends on !BUSYBOX_DISABLE_KMOD - select BUSYBOX_PLATFORM_LINUX - help - rmmod is used to unload specified modules from the kernel. - + insmod is used to load specified modules in the running kernel. config BUSYBOX_LSMOD - bool "lsmod" + bool "lsmod (1.9 kb)" default y - depends on !BUSYBOX_MODPROBE_SMALL - depends on !BUSYBOX_DISABLE_KMOD select BUSYBOX_PLATFORM_LINUX help - lsmod is used to display a list of loaded modules. + lsmod is used to display a list of loaded modules. config BUSYBOX_FEATURE_LSMOD_PRETTY_2_6_OUTPUT bool "Pretty output" - default n - depends on BUSYBOX_LSMOD + default y + depends on BUSYBOX_LSMOD && !BUSYBOX_MODPROBE_SMALL + 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_MODINFO + bool "modinfo (24 kb)" + default y select BUSYBOX_PLATFORM_LINUX help - This option makes output format of lsmod adjusted to - the format of module-init-tools for Linux kernel 2.6. - Increases size somewhat. - + Show information about a Linux Kernel module config BUSYBOX_MODPROBE - bool "modprobe" - default n - depends on !BUSYBOX_DISABLE_KMOD - depends on !BUSYBOX_MODPROBE_SMALL + bool "modprobe (28 kb)" + default y select BUSYBOX_PLATFORM_LINUX help - Handle the loading of modules, and their dependencies on a high - level. + Handle the loading of modules, and their dependencies on a high + level. config BUSYBOX_FEATURE_MODPROBE_BLACKLIST bool "Blacklist support" - default n - depends on BUSYBOX_MODPROBE - select BUSYBOX_PLATFORM_LINUX + default y + depends on BUSYBOX_MODPROBE && !BUSYBOX_MODPROBE_SMALL 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_DEPMOD - bool "depmod" - default n - depends on !BUSYBOX_DISABLE_KMOD - depends on !BUSYBOX_MODPROBE_SMALL + 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_RMMOD + bool "rmmod (3.3 kb)" + default y select BUSYBOX_PLATFORM_LINUX help - depmod generates modules.dep (and potentially modules.alias - and modules.symbols) that contain dependency information - for modprobe. + rmmod is used to unload specified modules from the kernel. comment "Options common to multiple modutils" @@ -154,138 +114,132 @@ config BUSYBOX_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED config BUSYBOX_FEATURE_2_4_MODULES bool "Support version 2.2/2.4 Linux kernels" default n - depends on BUSYBOX_INSMOD || BUSYBOX_RMMOD || BUSYBOX_LSMOD - select BUSYBOX_PLATFORM_LINUX + depends on (BUSYBOX_INSMOD || BUSYBOX_LSMOD || BUSYBOX_MODPROBE || BUSYBOX_RMMOD) && !BUSYBOX_MODPROBE_SMALL 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_FEATURE_INSMOD_TRY_MMAP - bool "Try to load module from a mmap'ed area" - default n - depends on BUSYBOX_INSMOD || BUSYBOX_MODPROBE_SMALL - select BUSYBOX_PLATFORM_LINUX - help - This option causes module loading code to try to mmap - module first. If it does not work (for example, - it does not work for compressed modules), module will be read - (and unpacked if needed) into a memory block allocated by malloc. - - The only case when mmap works but malloc does not is when - you are trying to load a big module on a very memory-constrained - machine. Malloc will momentarily need 2x as much memory as mmap. - - Choosing N saves about 250 bytes of code (on 32-bit x86). + 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_FEATURE_INSMOD_VERSION_CHECKING bool "Enable module version checking" default n depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) - select BUSYBOX_PLATFORM_LINUX help - Support checking of versions for modules. This is used to - ensure that the kernel and module are made for each other. + Support checking of versions for modules. This is used to + ensure that the kernel and module are made for each other. config BUSYBOX_FEATURE_INSMOD_KSYMOOPS_SYMBOLS bool "Add module symbols to kernel symbol table" default n depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) - select BUSYBOX_PLATFORM_LINUX help - 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 proper debugging support. If you are not interested in - Oops messages from kernel modules, say N. + By adding module symbols to the kernel symbol table, Oops messages + occurring within kernel modules can be properly debugged. By enabling + this feature, module symbols will always be added to the kernel symbol + table for proper debugging support. If you are not interested in + Oops messages from kernel modules, say N. config BUSYBOX_FEATURE_INSMOD_LOADINKMEM bool "In kernel memory optimization (uClinux only)" default n depends on BUSYBOX_FEATURE_2_4_MODULES && (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) - select BUSYBOX_PLATFORM_LINUX help - This is a special uClinux only memory optimization that lets insmod - load the specified kernel module directly into kernel space, reducing - memory usage by preventing the need for two copies of the module - being loaded into memory. + This is a special uClinux only memory optimization that lets insmod + load the specified kernel module directly into kernel space, reducing + memory usage by preventing the need for two copies of the module + being loaded into memory. config BUSYBOX_FEATURE_INSMOD_LOAD_MAP bool "Enable insmod load map (-m) option" default n depends on BUSYBOX_FEATURE_2_4_MODULES && BUSYBOX_INSMOD - select BUSYBOX_PLATFORM_LINUX help - Enabling this, one would be able to get a load map - output on stdout. This makes kernel module debugging - easier. - If you don't plan to debug kernel modules, you - don't need this option. + Enabling this, one would be able to get a load map + output on stdout. This makes kernel module debugging + easier. + If you don't plan to debug kernel modules, you + don't need this option. config BUSYBOX_FEATURE_INSMOD_LOAD_MAP_FULL bool "Symbols in load map" - default n - depends on BUSYBOX_FEATURE_INSMOD_LOAD_MAP && !BUSYBOX_MODPROBE_SMALL - select BUSYBOX_PLATFORM_LINUX + default y + depends on BUSYBOX_FEATURE_INSMOD_LOAD_MAP help - Without this option, -m will only output section - load map. With this option, -m will also output - symbols load map. + Without this option, -m will only output section + load map. With this option, -m will also output + symbols load map. config BUSYBOX_FEATURE_CHECK_TAINTED_MODULE bool "Support tainted module checking with new kernels" default y depends on (BUSYBOX_LSMOD || BUSYBOX_FEATURE_2_4_MODULES) && !BUSYBOX_MODPROBE_SMALL - select BUSYBOX_PLATFORM_LINUX 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. + 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_FEATURE_INSMOD_TRY_MMAP + bool "Try to load module from a mmap'ed area" + default n + depends on (BUSYBOX_INSMOD || BUSYBOX_MODPROBE) && !BUSYBOX_MODPROBE_SMALL + help + This option causes module loading code to try to mmap + module first. If it does not work (for example, + it does not work for compressed modules), module will be read + (and unpacked if needed) into a memory block allocated by malloc. + + The only case when mmap works but malloc does not is when + you are trying to load a big module on a very memory-constrained + machine. Malloc will momentarily need 2x as much memory as mmap. + + Choosing N saves about 250 bytes of code (on 32-bit x86). config BUSYBOX_FEATURE_MODUTILS_ALIAS - bool "Support for module.aliases file" + bool "Support module.aliases file" default y - depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE - select BUSYBOX_PLATFORM_LINUX + depends on (BUSYBOX_DEPMOD || BUSYBOX_MODPROBE) && !BUSYBOX_MODPROBE_SMALL help - Generate and parse modules.alias containing aliases for bus - identifiers: - alias pcmcia:m*c*f03fn*pfn*pa*pb*pc*pd* parport_cs + Generate and parse modules.alias containing aliases for bus + identifiers: + alias pcmcia:m*c*f03fn*pfn*pa*pb*pc*pd* parport_cs - and aliases for logical modules names e.g.: - alias padlock_aes aes - alias aes_i586 aes - alias aes_generic aes + and aliases for logical modules names e.g.: + alias padlock_aes aes + alias aes_i586 aes + alias aes_generic aes - Say Y if unsure. + Say Y if unsure. config BUSYBOX_FEATURE_MODUTILS_SYMBOLS - bool "Support for module.symbols file" + bool "Support module.symbols file" default y - depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE - select BUSYBOX_PLATFORM_LINUX + depends on (BUSYBOX_DEPMOD || BUSYBOX_MODPROBE) && !BUSYBOX_MODPROBE_SMALL help - Generate and parse modules.symbols containing aliases for - symbol_request() kernel calls, such as: - alias symbol:usb_sg_init usbcore + Generate and parse modules.symbols containing aliases for + symbol_request() kernel calls, such as: + alias symbol:usb_sg_init usbcore - Say Y if unsure. + 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 || BUSYBOX_MODINFO + depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODINFO help - Directory that contains kernel modules. - Defaults to "/lib/modules" + 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 || BUSYBOX_MODINFO - help - Filename that contains kernel modules dependencies. - Defaults to "modules.dep" + depends on BUSYBOX_DEPMOD || BUSYBOX_MODPROBE || BUSYBOX_MODINFO + help + Filename that contains kernel modules dependencies. + Defaults to "modules.dep". + If you configured the "simplified modutils" (BUSYBOX_MODPROBE_SMALL), a + ".bb" suffix will be added after this name. Do not specify ".bb" + here unless you intend your depmod or modprobe to work on + "modules.dep.bb.bb" or such. endmenu -- cgit v1.2.3