diff options
author | Kang-Che Sung <explorer09@gmail.com> | 2017-02-05 19:02:34 +0100 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-02-05 19:02:34 +0100 |
commit | 4ae658f077c9b8859e8f1aabee4b95c2c96dae1c (patch) | |
tree | ac0c91e705c2544f1041381895fac231b27ff442 /modutils/Config.src | |
parent | 8cc1ab3c11538773389060005ba9c053fae0f848 (diff) | |
download | busybox-w32-4ae658f077c9b8859e8f1aabee4b95c2c96dae1c.tar.gz busybox-w32-4ae658f077c9b8859e8f1aabee4b95c2c96dae1c.tar.bz2 busybox-w32-4ae658f077c9b8859e8f1aabee4b95c2c96dae1c.zip |
modutils: fix config options dependency (2)
- The modprobe-small implementation of rmmod no longer chdir's to
"/lib/modules/`uname -r`" as it was not necessary for rmmod's
operation. (And it no longer need to die if such modules directory
doesn't exist.)
- Configs DEFAULT_MODULES_DIR and DEFAULT_DEPMOD_FILE no longer depend
on MODPROBE_SMALL as the latter may not enable depmod or modprobe
that requires these configs.
- Clarify DEFAULT_DEPMOD_FILE's description regarding the ".bb" name
suffix.
Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
Diffstat (limited to 'modutils/Config.src')
-rw-r--r-- | modutils/Config.src | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/modutils/Config.src b/modutils/Config.src index a15cce518..d0bae2ea3 100644 --- a/modutils/Config.src +++ b/modutils/Config.src | |||
@@ -159,7 +159,7 @@ config FEATURE_MODUTILS_SYMBOLS | |||
159 | config DEFAULT_MODULES_DIR | 159 | config DEFAULT_MODULES_DIR |
160 | string "Default directory containing modules" | 160 | string "Default directory containing modules" |
161 | default "/lib/modules" | 161 | default "/lib/modules" |
162 | depends on DEPMOD || MODPROBE || MODPROBE_SMALL || MODINFO | 162 | depends on DEPMOD || MODPROBE || MODINFO |
163 | help | 163 | help |
164 | Directory that contains kernel modules. | 164 | Directory that contains kernel modules. |
165 | Defaults to "/lib/modules" | 165 | Defaults to "/lib/modules" |
@@ -167,9 +167,13 @@ config DEFAULT_MODULES_DIR | |||
167 | config DEFAULT_DEPMOD_FILE | 167 | config DEFAULT_DEPMOD_FILE |
168 | string "Default name of modules.dep" | 168 | string "Default name of modules.dep" |
169 | default "modules.dep" | 169 | default "modules.dep" |
170 | depends on DEPMOD || MODPROBE || MODPROBE_SMALL || MODINFO | 170 | depends on DEPMOD || MODPROBE || MODINFO |
171 | help | 171 | help |
172 | Filename that contains kernel modules dependencies. | 172 | Filename that contains kernel modules dependencies. |
173 | Defaults to "modules.dep" | 173 | Defaults to "modules.dep". |
174 | If you configured the "simplified modutils" (MODPROBE_SMALL), a | ||
175 | ".bb" suffix will be added after this name. Do not specify ".bb" | ||
176 | here unless you intend your depmod or modprobe to work on | ||
177 | "modules.dep.bb.bb" or such. | ||
174 | 178 | ||
175 | endmenu | 179 | endmenu |