Merge tag '1_26_2' into w32_1_26_2w32_1_26_2

8 files changed, 78 insertions, 74 deletions

diff --git a/modutils/Config.src b/modutils/Config.src
index 4227f356a..84ff34a08 100644
--- a/modutils/Config.src
+++ b/modutils/Config.src
@@ -5,6 +5,37 @@
 
 menu "Linux Module Utilities"
 
+config MODPROBE_SMALL
+        bool "Simplified modutils"
+        default y
+        select PLATFORM_LINUX
+        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_).
+
+          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.
+
+          NB: modules.dep.bb file format is not compatible
+          with modules.dep file as created/used by standard module tools.
+
+          Additional module parameters can be stored in
+          /etc/modules/$module_name files.
+
+          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
+
 INSERT
 
 comment "Options common to multiple modutils"
diff --git a/modutils/depmod.c b/modutils/depmod.c
index b9347027e..b7965ebd2 100644
--- a/modutils/depmod.c
+++ b/modutils/depmod.c
@@ -9,17 +9,18 @@
  */
 //config:config DEPMOD
 //config:       bool "depmod"
-//config:       default n
-//config:       depends on !MODPROBE_SMALL
+//config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:         depmod generates modules.dep (and potentially modules.alias
 //config:         and modules.symbols) that contain dependency information
 //config:         for modprobe.
 
-//applet:IF_DEPMOD(APPLET(depmod, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_DEPMOD(IF_NOT_MODPROBE_SMALL(APPLET(depmod, BB_DIR_SBIN, BB_SUID_DROP)))
 
+//kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y)
 //kbuild:lib-$(CONFIG_DEPMOD) += depmod.o modutils.o
+//kbuild:endif
 
 #include "libbb.h"
 #include "modutils.h"
diff --git a/modutils/insmod.c b/modutils/insmod.c
index 2ebf4beb9..f2c70e16f 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -8,15 +8,16 @@
  */
 //config:config INSMOD
 //config:       bool "insmod"
-//config:       default n
-//config:       depends on !MODPROBE_SMALL
+//config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:         insmod is used to load specified modules in the running kernel.
 
-//applet:IF_INSMOD(APPLET(insmod, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_INSMOD(IF_NOT_MODPROBE_SMALL(APPLET(insmod, BB_DIR_SBIN, BB_SUID_DROP)))
 
+//kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y)
 //kbuild:lib-$(CONFIG_INSMOD) += insmod.o modutils.o
+//kbuild:endif
 
 #include "libbb.h"
 #include "modutils.h"
diff --git a/modutils/lsmod.c b/modutils/lsmod.c
index ee85fb0fb..24589420a 100644
--- a/modutils/lsmod.c
+++ b/modutils/lsmod.c
@@ -9,25 +9,26 @@
  */
 //config:config LSMOD
 //config:       bool "lsmod"
-//config:       default n
-//config:       depends on !MODPROBE_SMALL
+//config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:         lsmod is used to display a list of loaded modules.
 //config:
 //config:config FEATURE_LSMOD_PRETTY_2_6_OUTPUT
 //config:       bool "Pretty output"
-//config:       default n
-//config:       depends on LSMOD
+//config:       default y
+//config:       depends on LSMOD && !MODPROBE_SMALL
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:         This option makes output format of lsmod adjusted to
 //config:         the format of module-init-tools for Linux kernel 2.6.
 //config:         Increases size somewhat.
 
-//applet:IF_LSMOD(APPLET(lsmod, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_LSMOD(IF_NOT_MODPROBE_SMALL(APPLET(lsmod, BB_DIR_SBIN, BB_SUID_DROP)))
 
+//kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y)
 //kbuild:lib-$(CONFIG_LSMOD) += lsmod.o modutils.o
+//kbuild:endif
 
 //usage:#if !ENABLE_MODPROBE_SMALL
 //usage:#define lsmod_trivial_usage
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index 51ba42f7a..0fc9ea454 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -7,37 +7,9 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-//config:config MODPROBE_SMALL
-//config:       bool "Simplified modutils"
-//config:       default y
-//config:       select PLATFORM_LINUX
-//config:       help
-//config:         Simplified modutils.
-//config:
-//config:         With this option modprobe does not require modules.dep file
-//config:         and does not use /etc/modules.conf file.
-//config:         It scans module files in /lib/modules/`uname -r` and
-//config:         determines dependencies and module alias names on the fly.
-//config:         This may make module loading slower, most notably
-//config:         when one needs to load module by alias (this requires
-//config:         scanning through module _bodies_).
-//config:
-//config:         At the first attempt to load a module by alias modprobe
-//config:         will try to generate modules.dep.bb file in order to speed up
-//config:         future loads by alias. Failure to do so (read-only /lib/modules,
-//config:         etc) is not reported, and future modprobes will be slow too.
-//config:
-//config:         NB: modules.dep.bb file format is not compatible
-//config:         with modules.dep file as created/used by standard module tools.
-//config:
-//config:         Additional module parameters can be stored in
-//config:         /etc/modules/$module_name files.
-//config:
-//config:         Apart from modprobe, other utilities are also provided:
-//config:         - insmod is an alias to modprobe
-//config:         - rmmod is an alias to modprobe -r
-//config:         - depmod generates modules.dep.bb
-//config:
+
+/* config MODPROBE_SMALL is defined in Config.src to ensure better "make config" order */
+
 //config:config FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
 //config:       bool "Accept module options on modprobe command line"
 //config:       default y
@@ -53,11 +25,11 @@
 //config:       help
 //config:         Check if the module is already loaded.
 
-//applet:IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, depmod))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, insmod))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, lsmod))
-//applet:IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, rmmod))
+//applet:IF_MODPROBE(IF_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP)))
+//applet:IF_DEPMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(depmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, depmod)))
+//applet:IF_INSMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(insmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, insmod)))
+//applet:IF_LSMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(lsmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, lsmod)))
+//applet:IF_RMMOD(IF_MODPROBE_SMALL(APPLET_ODDNAME(rmmod, modprobe, BB_DIR_SBIN, BB_SUID_DROP, rmmod)))
 
 //kbuild:lib-$(CONFIG_MODPROBE_SMALL) += modprobe-small.o
 
@@ -67,8 +39,8 @@
 #include <fnmatch.h>
 #include <sys/syscall.h>
 
-extern int init_module(void *module, unsigned long len, const char *options);
-extern int delete_module(const char *module, unsigned flags);
+#define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
+#define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags)
 #ifdef __NR_finit_module
 # define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags)
 #endif
@@ -958,7 +930,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
         IF_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE(char *options;)
 
         /* are we lsmod? -> just dump /proc/modules */
-        if ('l' == applet0) {
+        if (ENABLE_LSMOD && 'l' == applet0) {
                 xprint_and_close_file(xfopen_for_read("/proc/modules"));
                 return EXIT_SUCCESS;
         }
@@ -968,14 +940,14 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
         /* Prevent ugly corner cases with no modules at all */
         modinfo = xzalloc(sizeof(modinfo[0]));
 
-        if ('i' != applet0) { /* not insmod */
+        if (!ENABLE_INSMOD || 'i' != applet0) { /* not insmod */
                 /* Goto modules directory */
                 xchdir(CONFIG_DEFAULT_MODULES_DIR);
         }
         uname(&uts); /* never fails */
 
         /* depmod? */
-        if ('d' == applet0) {
+        if (ENABLE_DEPMOD && 'd' == applet0) {
                 /* Supported:
                  * -n: print result to stdout
                  * -a: process all modules (default)
@@ -1014,11 +986,11 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
         argv += optind;
 
         /* are we rmmod? -> simulate modprobe -r */
-        if ('r' == applet0) {
+        if (ENABLE_RMMOD && 'r' == applet0) {
                 option_mask32 |= OPT_r;
         }
 
-        if ('i' != applet0) { /* not insmod */
+        if (!ENABLE_INSMOD || 'i' != applet0) { /* not insmod */
                 /* Goto $VERSION directory */
                 xchdir(uts.release);
         }
@@ -1042,7 +1014,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
                 argv[1] = NULL;
 #endif
 
-        if ('i' == applet0) { /* insmod */
+        if (ENABLE_INSMOD && 'i' == applet0) { /* insmod */
                 size_t len;
                 void *map;
 
@@ -1062,7 +1034,7 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
         }
 
         /* Try to load modprobe.dep.bb */
-        if ('r' != applet0) { /* not rmmod */
+        if (!ENABLE_RMMOD || 'r' != applet0) { /* not rmmod */
                 load_dep_bb();
         }
 
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index d404ef92f..09e3de6c3 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -9,8 +9,7 @@
  */
 //config:config MODPROBE
 //config:       bool "modprobe"
-//config:       default n
-//config:       depends on !MODPROBE_SMALL
+//config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:         Handle the loading of modules, and their dependencies on a high
@@ -18,8 +17,8 @@
 //config:
 //config:config FEATURE_MODPROBE_BLACKLIST
 //config:       bool "Blacklist support"
-//config:       default n
-//config:       depends on MODPROBE
+//config:       default y
+//config:       depends on MODPROBE && !MODPROBE_SMALL
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:         Say 'y' here to enable support for the 'blacklist' command in
@@ -28,9 +27,11 @@
 //config:         hardware autodetection scripts to load modules like evdev, frame
 //config:         buffer drivers etc.
 
-//applet:IF_MODPROBE(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_MODPROBE(IF_NOT_MODPROBE_SMALL(APPLET(modprobe, BB_DIR_SBIN, BB_SUID_DROP)))
 
+//kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y)
 //kbuild:lib-$(CONFIG_MODPROBE) += modprobe.o modutils.o
+//kbuild:endif
 
 #include "libbb.h"
 #include "modutils.h"
diff --git a/modutils/modutils.c b/modutils/modutils.c
index d36caaf68..4204f06fe 100644
--- a/modutils/modutils.c
+++ b/modutils/modutils.c
@@ -7,17 +7,13 @@
  */
 #include "modutils.h"
 
-#ifdef __UCLIBC__
-extern int init_module(void *module, unsigned long len, const char *options);
-extern int delete_module(const char *module, unsigned int flags);
-#else
-# include <sys/syscall.h>
-# define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
-# if defined(__NR_finit_module)
-#  define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags)
-# endif
-# define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags)
+#include <sys/syscall.h>
+
+#define init_module(mod, len, opts) syscall(__NR_init_module, mod, len, opts)
+#if defined(__NR_finit_module)
+# define finit_module(fd, uargs, flags) syscall(__NR_finit_module, fd, uargs, flags)
 #endif
+#define delete_module(mod, flags) syscall(__NR_delete_module, mod, flags)
 
 static module_entry *helper_get_module(module_db *db, const char *module, int create)
 {
diff --git a/modutils/rmmod.c b/modutils/rmmod.c
index e0358838a..527696f63 100644
--- a/modutils/rmmod.c
+++ b/modutils/rmmod.c
@@ -9,15 +9,16 @@
  */
 //config:config RMMOD
 //config:       bool "rmmod"
-//config:       default n
-//config:       depends on !MODPROBE_SMALL
+//config:       default y
 //config:       select PLATFORM_LINUX
 //config:       help
 //config:         rmmod is used to unload specified modules from the kernel.
 
-//applet:IF_RMMOD(APPLET(rmmod, BB_DIR_SBIN, BB_SUID_DROP))
+//applet:IF_RMMOD(IF_NOT_MODPROBE_SMALL(APPLET(rmmod, BB_DIR_SBIN, BB_SUID_DROP)))
 
+//kbuild:ifneq ($(CONFIG_MODPROBE_SMALL),y)
 //kbuild:lib-$(CONFIG_RMMOD) += rmmod.o modutils.o
+//kbuild:endif
 
 //usage:#if !ENABLE_MODPROBE_SMALL
 //usage:#define rmmod_trivial_usage