4ae658f07
Kang-Che Sung
2017-02-05
Subject
modutils: fix config options dependency (2)
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
modutils/Config.src+7 -3
| @@ -159,7 +159,7 @@ config FEATURE_MODUTILS_SYMBOLS | |
| config DEFAULT_MODULES_DIR | |
| string "Default directory containing modules" | |
| default "/lib/modules" | |
| - | depends on DEPMOD || MODPROBE || MODPROBE_SMALL || MODINFO |
| + | depends on DEPMOD || MODPROBE || MODINFO |
| help | |
| Directory that contains kernel modules. | |
| Defaults to "/lib/modules" | |
| @@ -167,9 +167,13 @@ config DEFAULT_MODULES_DIR | |
| config DEFAULT_DEPMOD_FILE | |
| string "Default name of modules.dep" | |
| default "modules.dep" | |
| - | depends on DEPMOD || MODPROBE || MODPROBE_SMALL || MODINFO |
| + | depends on DEPMOD || MODPROBE || MODINFO |
| help | |
| Filename that contains kernel modules dependencies. | |
| - | Defaults to "modules.dep" |
| + | Defaults to "modules.dep". |
| + | If you configured the "simplified modutils" (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 | |
modutils/modprobe-small.c+3 -3
| @@ -934,11 +934,11 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv) | |
| /* Prevent ugly corner cases with no modules at all */ | |
| modinfo = xzalloc(sizeof(modinfo[0])); | |
| - | if (!is_insmod) { |
| + | if (is_depmod || is_modprobe) { |
| /* Goto modules directory */ | |
| xchdir(CONFIG_DEFAULT_MODULES_DIR); | |
| + | uname(&uts); /* never fails */ |
| } | |
| - | uname(&uts); /* never fails */ |
| /* depmod? */ | |
| if (is_depmod) { | |
| @@ -980,7 +980,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv) | |
| getopt32(argv, "qrfsvwb"); | |
| argv += optind; | |
| - | if (!is_insmod) { |
| + | if (is_modprobe) { |
| /* Goto $VERSION directory */ | |
| xchdir(uts.release); | |
| } | |