diff options
| author | Kang-Che Sung <explorer09@gmail.com> | 2017-01-30 19:14:50 +0100 |
|---|---|---|
| committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-01-30 19:14:50 +0100 |
| commit | 065e988e7ae66b3f36d280ed6ca580e29cb6358d (patch) | |
| tree | 00cb6398cc06019edc65e78eb8c79ea14e714de0 /modutils/Config.src | |
| parent | 67f6db6b2768e9af44132b0a11fbadf15c330283 (diff) | |
| download | busybox-w32-065e988e7ae66b3f36d280ed6ca580e29cb6358d.tar.gz busybox-w32-065e988e7ae66b3f36d280ed6ca580e29cb6358d.tar.bz2 busybox-w32-065e988e7ae66b3f36d280ed6ca580e29cb6358d.zip | |
modutils: fix config options dependency
module.aliases and module.symbols files have no use in modprobe-small
implementation. So FEATURE_MODUTILS_ALIAS and FEATURE_MODUTILS_SYMBOLS
will depend on !MODPROBE_SMALL.
The try_to_mmap_module() function is not called in modprobe-small.c,
so I will let FEATURE_INSMOD_TRY_MMAP depend on !MODPROBE_SMALL for
now.
Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Likewise, FEATURE_2_4_MODULES is not used by modprobe-small.
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'modutils/Config.src')
| -rw-r--r-- | modutils/Config.src | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/modutils/Config.src b/modutils/Config.src index 1808f332d..1aee57ee7 100644 --- a/modutils/Config.src +++ b/modutils/Config.src | |||
| @@ -43,7 +43,7 @@ comment "Options common to multiple modutils" | |||
| 43 | config FEATURE_2_4_MODULES | 43 | config FEATURE_2_4_MODULES |
| 44 | bool "Support version 2.2/2.4 Linux kernels" | 44 | bool "Support version 2.2/2.4 Linux kernels" |
| 45 | default n | 45 | default n |
| 46 | depends on INSMOD || RMMOD || LSMOD | 46 | depends on (INSMOD || RMMOD || LSMOD) && !MODPROBE_SMALL |
| 47 | select PLATFORM_LINUX | 47 | select PLATFORM_LINUX |
| 48 | help | 48 | help |
| 49 | Support module loading for 2.2.x and 2.4.x Linux kernels. | 49 | Support module loading for 2.2.x and 2.4.x Linux kernels. |
| @@ -53,7 +53,7 @@ config FEATURE_2_4_MODULES | |||
| 53 | config FEATURE_INSMOD_TRY_MMAP | 53 | config FEATURE_INSMOD_TRY_MMAP |
| 54 | bool "Try to load module from a mmap'ed area" | 54 | bool "Try to load module from a mmap'ed area" |
| 55 | default n | 55 | default n |
| 56 | depends on INSMOD || MODPROBE_SMALL | 56 | depends on INSMOD && !MODPROBE_SMALL |
| 57 | select PLATFORM_LINUX | 57 | select PLATFORM_LINUX |
| 58 | help | 58 | help |
| 59 | This option causes module loading code to try to mmap | 59 | This option causes module loading code to try to mmap |
| @@ -135,7 +135,7 @@ config FEATURE_CHECK_TAINTED_MODULE | |||
| 135 | config FEATURE_MODUTILS_ALIAS | 135 | config FEATURE_MODUTILS_ALIAS |
| 136 | bool "Support module.aliases file" | 136 | bool "Support module.aliases file" |
| 137 | default y | 137 | default y |
| 138 | depends on DEPMOD || MODPROBE | 138 | depends on (DEPMOD || MODPROBE) && !MODPROBE_SMALL |
| 139 | select PLATFORM_LINUX | 139 | select PLATFORM_LINUX |
| 140 | help | 140 | help |
| 141 | Generate and parse modules.alias containing aliases for bus | 141 | Generate and parse modules.alias containing aliases for bus |
| @@ -152,7 +152,7 @@ config FEATURE_MODUTILS_ALIAS | |||
| 152 | config FEATURE_MODUTILS_SYMBOLS | 152 | config FEATURE_MODUTILS_SYMBOLS |
| 153 | bool "Support module.symbols file" | 153 | bool "Support module.symbols file" |
| 154 | default y | 154 | default y |
| 155 | depends on DEPMOD || MODPROBE | 155 | depends on (DEPMOD || MODPROBE) && !MODPROBE_SMALL |
| 156 | select PLATFORM_LINUX | 156 | select PLATFORM_LINUX |
| 157 | help | 157 | help |
| 158 | Generate and parse modules.symbols containing aliases for | 158 | Generate and parse modules.symbols containing aliases for |