From b82b34e06d0f8b91a1a30a847e0b1dd80ed0a046 Mon Sep 17 00:00:00 2001
From: Pascal Bellard <pascal.bellard@ads-lu.com>
Date: Mon, 7 Jun 2010 01:16:45 +0200
Subject: modprobe: add support for -l and -s. Remove some unsupported options

Fixed some goofs in help text

function                                             old     new   delta
modprobe_main                                        494     653    +159
packed_usage                                       27129   27145     +16
insmod_main                                           98      95      -3

Signed-off-by: Pascal Bellard <pascal.bellard@ads-lu.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 modutils/insmod.c         |  22 ++++++
 modutils/modprobe-small.c |  13 ++++
 modutils/modprobe.c       | 171 +++++++++++++++++++++++++++++++++++++---------
 modutils/modutils.h       |  41 +++++------
 4 files changed, 193 insertions(+), 54 deletions(-)

(limited to 'modutils')

diff --git a/modutils/insmod.c b/modutils/insmod.c
index c4fb9279d..b88446c10 100644
--- a/modutils/insmod.c
+++ b/modutils/insmod.c
@@ -10,6 +10,28 @@
 #include "libbb.h"
 #include "modutils.h"
 
+/* 2.6 style insmod has no options and required filename
+ * (not module name - .ko can't be omitted) */
+
+//usage:#define insmod_trivial_usage
+//usage:	IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE ")
+//usage:	IF_NOT_FEATURE_2_4_MODULES("FILE ")
+//usage:	"[symbol=value]..."
+//usage:#define insmod_full_usage "\n\n"
+//usage:       "Load the specified kernel modules into the kernel"
+//usage:	IF_FEATURE_2_4_MODULES( "\n"
+//usage:     "\nOptions:"
+//usage:     "\n	-f	Force module to load into the wrong kernel version"
+//usage:     "\n	-k	Make module autoclean-able"
+//usage:     "\n	-v	Verbose"
+//usage:     "\n	-q	Quiet"
+//usage:     "\n	-L	Lock: prevent simultaneous loads"
+//usage:	IF_FEATURE_INSMOD_LOAD_MAP(
+//usage:     "\n	-m	Output load map to stdout"
+//usage:	)
+//usage:     "\n	-x	Don't export externs"
+//usage:	)
+
 int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int insmod_main(int argc UNUSED_PARAM, char **argv)
 {
diff --git a/modutils/modprobe-small.c b/modutils/modprobe-small.c
index cf22b9471..0e1874ed4 100644
--- a/modutils/modprobe-small.c
+++ b/modutils/modprobe-small.c
@@ -685,6 +685,19 @@ The following options are useful for people managing distributions:
                         Use the file instead of the current kernel symbols
 */
 
+//usage:#if ENABLE_MODPROBE_SMALL
+//usage:#define modprobe_trivial_usage
+//usage:	"[-qfwrsv] MODULE [symbol=value]..."
+//usage:#define modprobe_full_usage "\n\n"
+//usage:       "Options:"
+//usage:     "\n	-r	Remove MODULE (stacks) or do autoclean"
+//usage:     "\n	-q	Quiet"
+//usage:     "\n	-v	Verbose"
+//usage:     "\n	-f	Force"
+//usage:     "\n	-w	Wait for unload"
+//usage:     "\n	-s	Report via syslog instead of stderr"
+//usage:#endif /* ENABLE_MODPROBE_SMALL */
+
 int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int modprobe_main(int argc UNUSED_PARAM, char **argv)
 {
diff --git a/modutils/modprobe.c b/modutils/modprobe.c
index 69b9e4687..b4de65b1f 100644
--- a/modutils/modprobe.c
+++ b/modutils/modprobe.c
@@ -20,6 +20,104 @@
 //#define DBG(fmt, ...) bb_error_msg("%s: " fmt, __func__, ## __VA_ARGS__)
 #define DBG(...) ((void)0)
 
+//usage:#if !ENABLE_MODPROBE_SMALL
+//usage:#define modprobe_notes_usage
+//usage:	"modprobe can (un)load a stack of modules, passing each module options (when\n"
+//usage:	"loading). modprobe uses a configuration file to determine what option(s) to\n"
+//usage:	"pass each module it loads.\n"
+//usage:	"\n"
+//usage:	"The configuration file is searched (in this order):\n"
+//usage:	"\n"
+//usage:	"    /etc/modprobe.conf (2.6 only)\n"
+//usage:	"    /etc/modules.conf\n"
+//usage:	"    /etc/conf.modules (deprecated)\n"
+//usage:	"\n"
+//usage:	"They all have the same syntax (see below). If none is present, it is\n"
+//usage:	"_not_ an error; each loaded module is then expected to load without\n"
+//usage:	"options. Once a file is found, the others are tested for.\n"
+//usage:	"\n"
+//usage:	"/etc/modules.conf entry format:\n"
+//usage:	"\n"
+//usage:	"  alias <alias_name> <mod_name>\n"
+//usage:	"    Makes it possible to modprobe alias_name, when there is no such module.\n"
+//usage:	"    It makes sense if your mod_name is long, or you want a more representative\n"
+//usage:	"    name for that module (eg. 'scsi' in place of 'aha7xxx').\n"
+//usage:	"    This makes it also possible to use a different set of options (below) for\n"
+//usage:	"    the module and the alias.\n"
+//usage:	"    A module can be aliased more than once.\n"
+//usage:	"\n"
+//usage:	"  options <mod_name|alias_name> <symbol=value...>\n"
+//usage:	"    When loading module mod_name (or the module aliased by alias_name), pass\n"
+//usage:	"    the \"symbol=value\" pairs as option to that module.\n"
+//usage:	"\n"
+//usage:	"Sample /etc/modules.conf file:\n"
+//usage:	"\n"
+//usage:	"  options tulip irq=3\n"
+//usage:	"  alias tulip tulip2\n"
+//usage:	"  options tulip2 irq=4 io=0x308\n"
+//usage:	"\n"
+//usage:	"Other functionality offered by 'classic' modprobe is not available in\n"
+//usage:	"this implementation.\n"
+//usage:	"\n"
+//usage:	"If module options are present both in the config file, and on the command line,\n"
+//usage:	"then the options from the command line will be passed to the module _after_\n"
+//usage:	"the options from the config file. That way, you can have defaults in the config\n"
+//usage:	"file, and override them for a specific usage from the command line.\n"
+//usage:#define modprobe_example_usage
+//usage:       "(with the above /etc/modules.conf):\n\n"
+//usage:       "$ modprobe tulip\n"
+//usage:       "   will load the module 'tulip' with default option 'irq=3'\n\n"
+//usage:       "$ modprobe tulip irq=5\n"
+//usage:       "   will load the module 'tulip' with option 'irq=5', thus overriding the default\n\n"
+//usage:       "$ modprobe tulip2\n"
+//usage:       "   will load the module 'tulip' with default options 'irq=4 io=0x308',\n"
+//usage:       "   which are the default for alias 'tulip2'\n\n"
+//usage:       "$ modprobe tulip2 irq=8\n"
+//usage:       "   will load the module 'tulip' with default options 'irq=4 io=0x308 irq=8',\n"
+//usage:       "   which are the default for alias 'tulip2' overridden by the option 'irq=8'\n\n"
+//usage:       "   from the command line\n\n"
+//usage:       "$ modprobe tulip2 irq=2 io=0x210\n"
+//usage:       "   will load the module 'tulip' with default options 'irq=4 io=0x308 irq=4 io=0x210',\n"
+//usage:       "   which are the default for alias 'tulip2' overridden by the options 'irq=2 io=0x210'\n\n"
+//usage:       "   from the command line\n"
+//usage:
+//usage:#define modprobe_trivial_usage
+//usage:	"[-alrqvs"
+//usage:	IF_FEATURE_MODPROBE_BLACKLIST("b")
+//usage:	"] MODULE [symbol=value]..."
+//usage:#define modprobe_full_usage "\n\n"
+//usage:       "Options:"
+//usage:     "\n	-a	Load multiple MODULEs"
+//usage:     "\n	-l	List (MODULE is a pattern)"
+//usage:     "\n	-r	Remove MODULE (stacks) or do autoclean"
+//usage:     "\n	-q	Quiet"
+//usage:     "\n	-v	Verbose"
+//usage:     "\n	-s	Log to syslog"
+//usage:	IF_FEATURE_MODPROBE_BLACKLIST(
+//usage:     "\n	-b	Apply blacklist to module names too"
+//usage:	)
+//usage:#endif /* !ENABLE_MODPROBE_SMALL */
+
+/* Note that usage text doesn't document various 2.4 options
+ * we pull in through INSMOD_OPTS define */
+
+#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--ar:a--lr:r--al"
+#define MODPROBE_OPTS  "alr" IF_FEATURE_MODPROBE_BLACKLIST("b")
+//#define MODPROBE_COMPLEMENTARY "q-v:v-q:l--acr:a--lr:r--al"
+//#define MODPROBE_OPTS  "acd:lnrt:C:" IF_FEATURE_MODPROBE_BLACKLIST("b")
+enum {
+	MODPROBE_OPT_INSERT_ALL = (INSMOD_OPT_UNUSED << 0), /* a */
+	//MODPROBE_OPT_DUMP_ONLY= (INSMOD_OPT_UNUSED << x), /* c */
+	//MODPROBE_OPT_DIRNAME  = (INSMOD_OPT_UNUSED << x), /* d */
+	MODPROBE_OPT_LIST_ONLY  = (INSMOD_OPT_UNUSED << 1), /* l */
+	//MODPROBE_OPT_SHOW_ONLY= (INSMOD_OPT_UNUSED << x), /* n */
+	MODPROBE_OPT_REMOVE     = (INSMOD_OPT_UNUSED << 2), /* r */
+	//MODPROBE_OPT_RESTRICT = (INSMOD_OPT_UNUSED << x), /* t */
+	//MODPROBE_OPT_VERONLY  = (INSMOD_OPT_UNUSED << x), /* V */
+	//MODPROBE_OPT_CONFIGFILE=(INSMOD_OPT_UNUSED << x), /* C */
+	MODPROBE_OPT_BLACKLIST  = (INSMOD_OPT_UNUSED << 3) * ENABLE_FEATURE_MODPROBE_BLACKLIST,
+};
+
 #define MODULE_FLAG_LOADED              0x0001
 #define MODULE_FLAG_NEED_DEPS           0x0002
 /* "was seen in modules.dep": */
@@ -37,32 +135,6 @@ struct module_entry { /* I'll call it ME. */
 	llist_t *deps; /* strings. modules we depend on */
 };
 
-/* NB: INSMOD_OPT_SILENT bit suppresses ONLY non-existent modules,
- * not deleted ones (those are still listed in modules.dep).
- * module-init-tools version 3.4:
- * # modprobe bogus
- * FATAL: Module bogus not found. [exitcode 1]
- * # modprobe -q bogus            [silent, exitcode still 1]
- * but:
- * # rm kernel/drivers/net/dummy.ko
- * # modprobe -q dummy
- * FATAL: Could not open '/lib/modules/xxx/kernel/drivers/net/dummy.ko': No such file or directory
- * [exitcode 1]
- */
-#define MODPROBE_OPTS  "acdlnrt:VC:" IF_FEATURE_MODPROBE_BLACKLIST("b")
-enum {
-	MODPROBE_OPT_INSERT_ALL = (INSMOD_OPT_UNUSED << 0), /* a */
-	MODPROBE_OPT_DUMP_ONLY  = (INSMOD_OPT_UNUSED << 1), /* c */
-	MODPROBE_OPT_D          = (INSMOD_OPT_UNUSED << 2), /* d */
-	MODPROBE_OPT_LIST_ONLY  = (INSMOD_OPT_UNUSED << 3), /* l */
-	MODPROBE_OPT_SHOW_ONLY  = (INSMOD_OPT_UNUSED << 4), /* n */
-	MODPROBE_OPT_REMOVE     = (INSMOD_OPT_UNUSED << 5), /* r */
-	MODPROBE_OPT_RESTRICT   = (INSMOD_OPT_UNUSED << 6), /* t */
-	MODPROBE_OPT_VERONLY    = (INSMOD_OPT_UNUSED << 7), /* V */
-	MODPROBE_OPT_CONFIGFILE = (INSMOD_OPT_UNUSED << 8), /* C */
-	MODPROBE_OPT_BLACKLIST  = (INSMOD_OPT_UNUSED << 9) * ENABLE_FEATURE_MODPROBE_BLACKLIST,
-};
-
 struct globals {
 	llist_t *db; /* MEs of all modules ever seen (caching for speed) */
 	llist_t *probes; /* MEs of module(s) requested on cmdline */
@@ -264,6 +336,18 @@ static char *parse_and_add_kcmdline_module_options(char *options, const char *mo
  * -errno on open/read error,
  * errno on init_module() error
  */
+/* NB: INSMOD_OPT_SILENT bit suppresses ONLY non-existent modules,
+ * not deleted ones (those are still listed in modules.dep).
+ * module-init-tools version 3.4:
+ * # modprobe bogus
+ * FATAL: Module bogus not found. [exitcode 1]
+ * # modprobe -q bogus            [silent, exitcode still 1]
+ * but:
+ * # rm kernel/drivers/net/dummy.ko
+ * # modprobe -q dummy
+ * FATAL: Could not open '/lib/modules/xxx/kernel/drivers/net/dummy.ko': No such file or directory
+ * [exitcode 1]
+ */
 static int do_modprobe(struct module_entry *m)
 {
 	struct module_entry *m2 = m2; /* for compiler */
@@ -395,13 +479,38 @@ int modprobe_main(int argc UNUSED_PARAM, char **argv)
 	unsigned opt;
 	struct module_entry *me;
 
-	opt_complementary = "q-v:v-q";
-	opt = getopt32(argv, INSMOD_OPTS MODPROBE_OPTS INSMOD_ARGS, NULL, NULL);
+	opt_complementary = MODPROBE_COMPLEMENTARY;
+	opt = getopt32(argv, INSMOD_OPTS MODPROBE_OPTS INSMOD_ARGS);
 	argv += optind;
 
-	if (opt & (MODPROBE_OPT_DUMP_ONLY | MODPROBE_OPT_LIST_ONLY |
-				MODPROBE_OPT_SHOW_ONLY))
-		bb_error_msg_and_die("not supported");
+	if (opt & MODPROBE_OPT_LIST_ONLY) {
+		char name[MODULE_NAME_LEN];
+		char *colon, *tokens[2];
+		parser_t *p = config_open2(CONFIG_DEFAULT_DEPMOD_FILE, xfopen_for_read);
+
+		while (config_read(p, tokens, 2, 1, "# \t", PARSE_NORMAL)) {
+			colon = last_char_is(tokens[0], ':');
+			if (!colon)
+				continue;
+			*colon = '\0';
+			filename2modname(tokens[0], name);
+			if (!argv[0])
+				puts(tokens[0]);
+			else {
+				int i;
+				for (i = 0; argv[i]; i++) {
+					if (fnmatch(argv[i], name, 0) == 0) {
+						puts(tokens[0]);
+					}
+				}
+			}
+		}
+		return EXIT_SUCCESS;
+	}
+
+	/* Yes, for some reason -l ignores -s... */
+	if (opt & INSMOD_OPT_SYSLOG)
+		logmode = LOGMODE_SYSLOG;
 
 	if (!argv[0]) {
 		if (opt & MODPROBE_OPT_REMOVE) {
diff --git a/modutils/modutils.h b/modutils/modutils.h
index 131a5087b..d46870ca6 100644
--- a/modutils/modutils.h
+++ b/modutils/modutils.h
@@ -23,32 +23,27 @@ int string_to_llist(char *string, llist_t **llist, const char *delim) FAST_FUNC;
 char *filename2modname(const char *filename, char *modname) FAST_FUNC;
 char *parse_cmdline_module_options(char **argv) FAST_FUNC;
 
+/* insmod for 2.4 and modprobe's options (insmod 2.6 has no options at all): */
 #define INSMOD_OPTS \
-	"vq" \
-	IF_FEATURE_2_4_MODULES("sLo:fkx") \
-	IF_FEATURE_INSMOD_LOAD_MAP("m")
-
-#define INSMOD_ARGS IF_FEATURE_2_4_MODULES(, NULL)
+	"vqs" \
+	IF_FEATURE_2_4_MODULES("Lfkx" IF_FEATURE_INSMOD_LOAD_MAP("m"))
+#define INSMOD_ARGS /* (was meant to support -o NAME) , NULL */
 
 enum {
-	INSMOD_OPT_VERBOSE	= 0x0001,
-	INSMOD_OPT_SILENT	= 0x0002,
-	INSMOD_OPT_SYSLOG	= 0x0004 * ENABLE_FEATURE_2_4_MODULES,
-	INSMOD_OPT_LOCK		= 0x0008 * ENABLE_FEATURE_2_4_MODULES,
-	INSMOD_OPT_OUTPUTNAME	= 0x0010 * ENABLE_FEATURE_2_4_MODULES,
-	INSMOD_OPT_FORCE	= 0x0020 * ENABLE_FEATURE_2_4_MODULES,
-	INSMOD_OPT_KERNELD	= 0x0040 * ENABLE_FEATURE_2_4_MODULES,
-	INSMOD_OPT_NO_EXPORT	= 0x0080 * ENABLE_FEATURE_2_4_MODULES,
-	INSMOD_OPT_PRINT_MAP	= 0x0100 * ENABLE_FEATURE_INSMOD_LOAD_MAP,
-#if ENABLE_FEATURE_2_4_MODULES
-# if ENABLE_FEATURE_INSMOD_LOAD_MAP
-	INSMOD_OPT_UNUSED	= 0x0200,
-# else
-	INSMOD_OPT_UNUSED	= 0x0100,
-# endif
-#else
-	INSMOD_OPT_UNUSED	= 0x0004,
-#endif
+	INSMOD_OPT_VERBOSE      = (1 << 0),
+	INSMOD_OPT_SILENT       = (1 << 1),
+	INSMOD_OPT_SYSLOG       = (1 << 2),
+	//INSMOD_OPT_OUTPUTNAME = (1 << x) - not supported yet
+	INSMOD_OPT_LOCK         = (1 << 3) * ENABLE_FEATURE_2_4_MODULES,
+	INSMOD_OPT_FORCE        = (1 << 4) * ENABLE_FEATURE_2_4_MODULES,
+	INSMOD_OPT_KERNELD      = (1 << 5) * ENABLE_FEATURE_2_4_MODULES,
+	INSMOD_OPT_NO_EXPORT    = (1 << 6) * ENABLE_FEATURE_2_4_MODULES,
+	INSMOD_OPT_PRINT_MAP    = (1 << 7) * ENABLE_FEATURE_INSMOD_LOAD_MAP,
+	INSMOD_OPT_UNUSED       =
+		(INSMOD_OPT_PRINT_MAP ? INSMOD_OPT_PRINT_MAP
+		: INSMOD_OPT_NO_EXPORT ? INSMOD_OPT_NO_EXPORT
+		: INSMOD_OPT_SYSLOG
+		) << 1
 };
 
 #if ENABLE_FEATURE_INSMOD_TRY_MMAP
-- 
cgit v1.2.3-55-g6feb


From d70e0e995e41dc422442acd1eb4b086ff81b1961 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Tue, 8 Jun 2010 12:15:11 +0200
Subject: *: add INSERTs to *.src files where appropriate

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 archival/Config.src                       | 2 ++
 archival/Kbuild.src                       | 3 +++
 archival/libunarchive/Kbuild.src          | 2 ++
 console-tools/Config.src                  | 2 ++
 console-tools/Kbuild.src                  | 2 ++
 coreutils/Kbuild.src                      | 1 +
 coreutils/libcoreutils/Kbuild.src         | 2 ++
 debianutils/Config.src                    | 2 ++
 debianutils/Kbuild.src                    | 2 ++
 e2fsprogs/Config.src                      | 2 ++
 e2fsprogs/Kbuild.src                      | 2 ++
 e2fsprogs/old_e2fsprogs/Config.src        | 2 ++
 e2fsprogs/old_e2fsprogs/Kbuild.src        | 2 ++
 e2fsprogs/old_e2fsprogs/blkid/Kbuild.src  | 3 +++
 e2fsprogs/old_e2fsprogs/e2p/Kbuild.src    | 3 +++
 e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src | 3 +++
 e2fsprogs/old_e2fsprogs/uuid/Kbuild.src   | 2 ++
 editors/Config.src                        | 2 ++
 editors/Kbuild.src                        | 2 ++
 init/Config.src                           | 2 ++
 init/Kbuild.src                           | 2 ++
 libbb/Config.src                          | 2 ++
 libbb/Kbuild.src                          | 2 ++
 loginutils/Config.src                     | 2 ++
 loginutils/Kbuild.src                     | 2 ++
 mailutils/Config.src                      | 2 ++
 mailutils/Kbuild.src                      | 2 ++
 miscutils/Config.src                      | 2 ++
 miscutils/Kbuild.src                      | 2 ++
 modutils/Kbuild.src                       | 1 +
 networking/Config.src                     | 2 ++
 networking/Kbuild.src                     | 2 ++
 networking/libiproute/Kbuild.src          | 2 ++
 networking/udhcp/Config.src               | 2 ++
 networking/udhcp/Kbuild.src               | 2 ++
 printutils/Config.src                     | 2 ++
 procps/Config.src                         | 2 ++
 procps/Kbuild.src                         | 2 ++
 runit/Config.src                          | 2 ++
 runit/Kbuild.src                          | 3 +++
 selinux/Config.src                        | 2 ++
 selinux/Kbuild.src                        | 2 ++
 shell/Config.src                          | 2 ++
 shell/Kbuild.src                          | 3 +++
 sysklogd/Config.src                       | 2 ++
 sysklogd/Kbuild.src                       | 2 ++
 util-linux/Config.src                     | 2 ++
 util-linux/Kbuild.src                     | 2 ++
 util-linux/volume_id/Kbuild.src           | 2 ++
 49 files changed, 102 insertions(+)

(limited to 'modutils')

diff --git a/archival/Config.src b/archival/Config.src
index de453bc21..3dbd3aea1 100644
--- a/archival/Config.src
+++ b/archival/Config.src
@@ -5,6 +5,8 @@
 
 menu "Archival Utilities"
 
+INSERT
+
 config FEATURE_SEAMLESS_XZ
 	bool "Make tar, rpm, modprobe etc understand .xz data"
 	default y
diff --git a/archival/Kbuild.src b/archival/Kbuild.src
index 3300ea90f..076e58278 100644
--- a/archival/Kbuild.src
+++ b/archival/Kbuild.src
@@ -7,6 +7,9 @@
 libs-y				+= libunarchive/
 
 lib-y:=
+
+INSERT
+
 lib-$(CONFIG_AR)		+= ar.o
 lib-$(CONFIG_CPIO)		+= cpio.o
 lib-$(CONFIG_DPKG)		+= dpkg.o
diff --git a/archival/libunarchive/Kbuild.src b/archival/libunarchive/Kbuild.src
index ed8e85793..81854558b 100644
--- a/archival/libunarchive/Kbuild.src
+++ b/archival/libunarchive/Kbuild.src
@@ -33,6 +33,8 @@ DPKG_FILES:= \
 	get_header_tar.o \
 	filter_accept_list_reassign.o
 
+INSERT
+
 lib-$(CONFIG_AR)                        += get_header_ar.o unpack_ar_archive.o
 lib-$(CONFIG_BUNZIP2)                   += decompress_bunzip2.o
 lib-$(CONFIG_UNLZMA)                    += decompress_unlzma.o
diff --git a/console-tools/Config.src b/console-tools/Config.src
index 1a8e2e128..6e3191ada 100644
--- a/console-tools/Config.src
+++ b/console-tools/Config.src
@@ -5,6 +5,8 @@
 
 menu "Console Utilities"
 
+INSERT
+
 config CHVT
 	bool "chvt"
 	default y
diff --git a/console-tools/Kbuild.src b/console-tools/Kbuild.src
index ad8b8ce77..17f660638 100644
--- a/console-tools/Kbuild.src
+++ b/console-tools/Kbuild.src
@@ -5,6 +5,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_CHVT)		+= chvt.o
 lib-$(CONFIG_FGCONSOLE)		+= fgconsole.o
 lib-$(CONFIG_CLEAR)		+= clear.o
diff --git a/coreutils/Kbuild.src b/coreutils/Kbuild.src
index 57ea7d6c4..1c846a75f 100644
--- a/coreutils/Kbuild.src
+++ b/coreutils/Kbuild.src
@@ -7,6 +7,7 @@
 libs-y			+= libcoreutils/
 
 lib-y:=
+
 INSERT
 lib-$(CONFIG_CAL)       += cal.o
 lib-$(CONFIG_CATV)      += catv.o
diff --git a/coreutils/libcoreutils/Kbuild.src b/coreutils/libcoreutils/Kbuild.src
index 755d01f86..981b60628 100644
--- a/coreutils/libcoreutils/Kbuild.src
+++ b/coreutils/libcoreutils/Kbuild.src
@@ -5,6 +5,8 @@
 # Licensed under the GPL v2 or later, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_MKFIFO)	+= getopt_mk_fifo_nod.o
 lib-$(CONFIG_MKNOD)	+= getopt_mk_fifo_nod.o
 lib-$(CONFIG_INSTALL)	+= cp_mv_stat.o
diff --git a/debianutils/Config.src b/debianutils/Config.src
index 9bce0498c..838d8f00c 100644
--- a/debianutils/Config.src
+++ b/debianutils/Config.src
@@ -5,6 +5,8 @@
 
 menu "Debian Utilities"
 
+INSERT
+
 config MKTEMP
 	bool "mktemp"
 	default y
diff --git a/debianutils/Kbuild.src b/debianutils/Kbuild.src
index bcf6126ad..da34e4e4f 100644
--- a/debianutils/Kbuild.src
+++ b/debianutils/Kbuild.src
@@ -5,6 +5,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_MKTEMP)            += mktemp.o
 lib-$(CONFIG_PIPE_PROGRESS)     += pipe_progress.o
 lib-$(CONFIG_RUN_PARTS)         += run_parts.o
diff --git a/e2fsprogs/Config.src b/e2fsprogs/Config.src
index e331ee5ef..f362c6b0a 100644
--- a/e2fsprogs/Config.src
+++ b/e2fsprogs/Config.src
@@ -5,6 +5,8 @@
 
 menu "Linux Ext2 FS Progs"
 
+INSERT
+
 config CHATTR
 	bool "chattr"
 	default y
diff --git a/e2fsprogs/Kbuild.src b/e2fsprogs/Kbuild.src
index 0fdc9d215..31c271238 100644
--- a/e2fsprogs/Kbuild.src
+++ b/e2fsprogs/Kbuild.src
@@ -6,6 +6,8 @@
 
 lib-y:=
 
+INSERT
+
 lib-$(CONFIG_CHATTR) += chattr.o e2fs_lib.o
 lib-$(CONFIG_LSATTR) += lsattr.o e2fs_lib.o
 
diff --git a/e2fsprogs/old_e2fsprogs/Config.src b/e2fsprogs/old_e2fsprogs/Config.src
index 5990f556c..bbec08e7e 100644
--- a/e2fsprogs/old_e2fsprogs/Config.src
+++ b/e2fsprogs/old_e2fsprogs/Config.src
@@ -5,6 +5,8 @@
 
 menu "Linux Ext2 FS Progs"
 
+INSERT
+
 config CHATTR
 	bool "chattr"
 	default n
diff --git a/e2fsprogs/old_e2fsprogs/Kbuild.src b/e2fsprogs/old_e2fsprogs/Kbuild.src
index b05bb92e1..07a09ca3d 100644
--- a/e2fsprogs/old_e2fsprogs/Kbuild.src
+++ b/e2fsprogs/old_e2fsprogs/Kbuild.src
@@ -6,6 +6,8 @@
 
 lib-y:=
 
+INSERT
+
 lib-$(CONFIG_CHATTR)     += chattr.o
 lib-$(CONFIG_E2FSCK)     += e2fsck.o util.o
 lib-$(CONFIG_FSCK)       += fsck.o util.o
diff --git a/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src b/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src
index ddcfdfd9a..bae77fe63 100644
--- a/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src
+++ b/e2fsprogs/old_e2fsprogs/blkid/Kbuild.src
@@ -10,6 +10,9 @@ NEEDED-$(CONFIG_MKE2FS) = y
 NEEDED-$(CONFIG_TUNE2FS) = y
 
 lib-y:=
+
+INSERT
+
 lib-$(NEEDED-y) += cache.o dev.o devname.o devno.o blkid_getsize.o \
                    probe.o read.o resolve.o save.o tag.o list.o
 
diff --git a/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src b/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src
index c0ff824e3..194870788 100644
--- a/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src
+++ b/e2fsprogs/old_e2fsprogs/e2p/Kbuild.src
@@ -10,6 +10,9 @@ NEEDED-$(CONFIG_MKE2FS) = y
 NEEDED-$(CONFIG_TUNE2FS) = y
 
 lib-y:=
+
+INSERT
+
 lib-$(NEEDED-y) += fgetsetflags.o fgetsetversion.o pf.o iod.o mntopts.o \
            feature.o ls.o uuid.o pe.o ostype.o ps.o hashstr.o \
            parse_num.o
diff --git a/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src b/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src
index 185887a44..8ca65ee90 100644
--- a/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src
+++ b/e2fsprogs/old_e2fsprogs/ext2fs/Kbuild.src
@@ -10,6 +10,9 @@ NEEDED-$(CONFIG_MKE2FS) = y
 NEEDED-$(CONFIG_TUNE2FS) = y
 
 lib-y:=
+
+INSERT
+
 lib-$(NEEDED-y) += gen_bitmap.o bitops.o ismounted.o mkjournal.o unix_io.o \
                    rw_bitmaps.o initialize.o bitmaps.o block.o \
                    ind_block.o inode.o freefs.o alloc_stats.o closefs.o \
diff --git a/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src b/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src
index dde981840..9454faba7 100644
--- a/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src
+++ b/e2fsprogs/old_e2fsprogs/uuid/Kbuild.src
@@ -10,5 +10,7 @@ NEEDED-$(CONFIG_MKE2FS) = y
 NEEDED-$(CONFIG_TUNE2FS) = y
 
 lib-y:=
+
+INSERT
 lib-$(NEEDED-y) += compare.o gen_uuid.o pack.o parse.o unpack.o unparse.o \
                    uuid_time.o
diff --git a/editors/Config.src b/editors/Config.src
index 6cf21919c..fc824ccd5 100644
--- a/editors/Config.src
+++ b/editors/Config.src
@@ -5,6 +5,8 @@
 
 menu "Editors"
 
+INSERT
+
 config AWK
 	bool "awk"
 	default y
diff --git a/editors/Kbuild.src b/editors/Kbuild.src
index 76302aa76..9d4b9d053 100644
--- a/editors/Kbuild.src
+++ b/editors/Kbuild.src
@@ -5,6 +5,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_AWK)       += awk.o
 lib-$(CONFIG_CMP)       += cmp.o
 lib-$(CONFIG_DIFF)      += diff.o
diff --git a/init/Config.src b/init/Config.src
index e8121c96a..2e9208150 100644
--- a/init/Config.src
+++ b/init/Config.src
@@ -5,6 +5,8 @@
 
 menu "Init Utilities"
 
+INSERT
+
 config INIT
 	bool "init"
 	default y
diff --git a/init/Kbuild.src b/init/Kbuild.src
index ce3f30256..6095a78bb 100644
--- a/init/Kbuild.src
+++ b/init/Kbuild.src
@@ -5,6 +5,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_HALT)       += halt.o
 lib-$(CONFIG_INIT)       += init.o
 lib-$(CONFIG_MESG)       += mesg.o
diff --git a/libbb/Config.src b/libbb/Config.src
index a0aeb3683..80b1e0d21 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -5,6 +5,8 @@
 
 menu "Busybox Library Tuning"
 
+INSERT
+
 config PASSWORD_MINLEN
 	int "Minimum password length"
 	default 6
diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index 68d04b3bd..29c136ccb 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -6,6 +6,8 @@
 
 lib-y:=
 
+INSERT
+
 lib-y += appletlib.o
 lib-y += ask_confirmation.o
 lib-y += bb_askpass.o
diff --git a/loginutils/Config.src b/loginutils/Config.src
index 982d5d669..5d497c4dc 100644
--- a/loginutils/Config.src
+++ b/loginutils/Config.src
@@ -5,6 +5,8 @@
 
 menu "Login/Password Management Utilities"
 
+INSERT
+
 config FEATURE_SHADOWPASSWDS
 	bool "Support for shadow passwords"
 	default y
diff --git a/loginutils/Kbuild.src b/loginutils/Kbuild.src
index 3d0d777e8..fd1ea06c1 100644
--- a/loginutils/Kbuild.src
+++ b/loginutils/Kbuild.src
@@ -5,6 +5,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_ADDGROUP)	+= addgroup.o
 lib-$(CONFIG_ADDUSER)	+= adduser.o
 lib-$(CONFIG_CRYPTPW)	+= cryptpw.o
diff --git a/mailutils/Config.src b/mailutils/Config.src
index baa04331a..2a9c5c074 100644
--- a/mailutils/Config.src
+++ b/mailutils/Config.src
@@ -1,5 +1,7 @@
 menu "Mail Utilities"
 
+INSERT
+
 config MAKEMIME
 	bool "makemime"
 	default y
diff --git a/mailutils/Kbuild.src b/mailutils/Kbuild.src
index 871e87981..b2fb73515 100644
--- a/mailutils/Kbuild.src
+++ b/mailutils/Kbuild.src
@@ -5,6 +5,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_MAKEMIME)     += mime.o mail.o
 lib-$(CONFIG_POPMAILDIR)   += popmaildir.o mail.o
 lib-$(CONFIG_REFORMIME)    += mime.o mail.o
diff --git a/miscutils/Config.src b/miscutils/Config.src
index a822f2a19..be2b37666 100644
--- a/miscutils/Config.src
+++ b/miscutils/Config.src
@@ -5,6 +5,8 @@
 
 menu "Miscellaneous Utilities"
 
+INSERT
+
 config ADJTIMEX
 	bool "adjtimex"
 	default y
diff --git a/miscutils/Kbuild.src b/miscutils/Kbuild.src
index 3c8ce42ba..d9bf14312 100644
--- a/miscutils/Kbuild.src
+++ b/miscutils/Kbuild.src
@@ -5,6 +5,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_ADJTIMEX)    += adjtimex.o
 lib-$(CONFIG_BBCONFIG)    += bbconfig.o
 lib-$(CONFIG_BEEP)        += beep.o
diff --git a/modutils/Kbuild.src b/modutils/Kbuild.src
index fc0808d7f..a512f6066 100644
--- a/modutils/Kbuild.src
+++ b/modutils/Kbuild.src
@@ -5,6 +5,7 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
 INSERT
 lib-$(CONFIG_MODPROBE_SMALL)      += modprobe-small.o
 lib-$(CONFIG_DEPMOD)              += depmod.o modutils.o
diff --git a/networking/Config.src b/networking/Config.src
index eb8dc1ce2..51dcb7717 100644
--- a/networking/Config.src
+++ b/networking/Config.src
@@ -5,6 +5,8 @@
 
 menu "Networking Utilities"
 
+INSERT
+
 config FEATURE_IPV6
 	bool "Enable IPv6 support"
 	default y
diff --git a/networking/Kbuild.src b/networking/Kbuild.src
index b0765bcf6..e1a4ebcb3 100644
--- a/networking/Kbuild.src
+++ b/networking/Kbuild.src
@@ -5,6 +5,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_ARP)          += arp.o interface.o
 lib-$(CONFIG_ARPING)       += arping.o
 lib-$(CONFIG_BRCTL)        += brctl.o
diff --git a/networking/libiproute/Kbuild.src b/networking/libiproute/Kbuild.src
index 5f9dd32b6..b0aa50a97 100644
--- a/networking/libiproute/Kbuild.src
+++ b/networking/libiproute/Kbuild.src
@@ -7,6 +7,8 @@
 
 lib-y:=
 
+INSERT
+
 lib-$(CONFIG_SLATTACH) += \
 	utils.o
 
diff --git a/networking/udhcp/Config.src b/networking/udhcp/Config.src
index f5840a945..aac88569b 100644
--- a/networking/udhcp/Config.src
+++ b/networking/udhcp/Config.src
@@ -3,6 +3,8 @@
 # see scripts/kbuild/config-language.txt.
 #
 
+INSERT
+
 config UDHCPD
 	bool "udhcp server (udhcpd)"
 	default y
diff --git a/networking/udhcp/Kbuild.src b/networking/udhcp/Kbuild.src
index 1803903f0..f845bc1d9 100644
--- a/networking/udhcp/Kbuild.src
+++ b/networking/udhcp/Kbuild.src
@@ -7,6 +7,8 @@
 
 lib-y:=
 
+INSERT
+
 lib-$(CONFIG_UDHCPC)     += common.o packet.o signalpipe.o socket.o
 lib-$(CONFIG_UDHCPD)     += common.o packet.o signalpipe.o socket.o
 
diff --git a/printutils/Config.src b/printutils/Config.src
index 194789660..cc4ab8d28 100644
--- a/printutils/Config.src
+++ b/printutils/Config.src
@@ -5,6 +5,8 @@
 
 menu "Print Utilities"
 
+INSERT
+
 config LPD
 	bool "lpd"
 	default y
diff --git a/procps/Config.src b/procps/Config.src
index 01f6b0cf9..e61de5614 100644
--- a/procps/Config.src
+++ b/procps/Config.src
@@ -5,6 +5,8 @@
 
 menu "Process Utilities"
 
+INSERT
+
 config FREE
 	bool "free"
 	default y
diff --git a/procps/Kbuild.src b/procps/Kbuild.src
index 8e62fdfa6..c41f12b15 100644
--- a/procps/Kbuild.src
+++ b/procps/Kbuild.src
@@ -5,6 +5,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_FREE)	+= free.o
 lib-$(CONFIG_FUSER)	+= fuser.o
 lib-$(CONFIG_KILL)	+= kill.o
diff --git a/runit/Config.src b/runit/Config.src
index 53b445101..9db974002 100644
--- a/runit/Config.src
+++ b/runit/Config.src
@@ -5,6 +5,8 @@
 
 menu "Runit Utilities"
 
+INSERT
+
 config RUNSV
 	bool "runsv"
 	default y
diff --git a/runit/Kbuild.src b/runit/Kbuild.src
index ab9eef6ff..4d85372df 100644
--- a/runit/Kbuild.src
+++ b/runit/Kbuild.src
@@ -5,6 +5,9 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
+
 lib-$(CONFIG_RUNSV) += runsv.o runit_lib.o
 lib-$(CONFIG_RUNSVDIR) += runsvdir.o runit_lib.o
 lib-$(CONFIG_SV) += sv.o runit_lib.o
diff --git a/selinux/Config.src b/selinux/Config.src
index e46030adf..64a99203e 100644
--- a/selinux/Config.src
+++ b/selinux/Config.src
@@ -6,6 +6,8 @@
 menu "SELinux Utilities"
 	depends on SELINUX
 
+INSERT
+
 config CHCON
 	bool "chcon"
 	default n
diff --git a/selinux/Kbuild.src b/selinux/Kbuild.src
index d0c190ceb..6567e3c07 100644
--- a/selinux/Kbuild.src
+++ b/selinux/Kbuild.src
@@ -6,6 +6,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_CHCON)		+= chcon.o
 lib-$(CONFIG_GETENFORCE)	+= getenforce.o
 lib-$(CONFIG_GETSEBOOL)		+= getsebool.o
diff --git a/shell/Config.src b/shell/Config.src
index 966fa7012..800911966 100644
--- a/shell/Config.src
+++ b/shell/Config.src
@@ -5,6 +5,8 @@
 
 menu "Shells"
 
+INSERT
+
 config ASH
 	bool "ash"
 	default y
diff --git a/shell/Kbuild.src b/shell/Kbuild.src
index 8bdb68b11..d76b35386 100644
--- a/shell/Kbuild.src
+++ b/shell/Kbuild.src
@@ -5,6 +5,9 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
+
 lib-$(CONFIG_ASH)      += ash.o ash_ptr_hack.o shell_common.o
 lib-$(CONFIG_HUSH)     += hush.o match.o shell_common.o
 lib-$(CONFIG_CTTYHACK) += cttyhack.o
diff --git a/sysklogd/Config.src b/sysklogd/Config.src
index af00d65bb..6d574abb1 100644
--- a/sysklogd/Config.src
+++ b/sysklogd/Config.src
@@ -5,6 +5,8 @@
 
 menu "System Logging Utilities"
 
+INSERT
+
 config SYSLOGD
 	bool "syslogd"
 	default y
diff --git a/sysklogd/Kbuild.src b/sysklogd/Kbuild.src
index d802198e6..faaac110c 100644
--- a/sysklogd/Kbuild.src
+++ b/sysklogd/Kbuild.src
@@ -5,6 +5,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_KLOGD)		+= klogd.o
 lib-$(CONFIG_LOGGER)		+= syslogd_and_logger.o
 lib-$(CONFIG_LOGREAD)		+= logread.o
diff --git a/util-linux/Config.src b/util-linux/Config.src
index 997cdec83..e97125917 100644
--- a/util-linux/Config.src
+++ b/util-linux/Config.src
@@ -5,6 +5,8 @@
 
 menu "Linux System Utilities"
 
+INSERT
+
 config ACPID
 	bool "acpid"
 	default y
diff --git a/util-linux/Kbuild.src b/util-linux/Kbuild.src
index 4fa392398..afc0db50e 100644
--- a/util-linux/Kbuild.src
+++ b/util-linux/Kbuild.src
@@ -5,6 +5,8 @@
 # Licensed under the GPL v2, see the file LICENSE in this tarball.
 
 lib-y:=
+
+INSERT
 lib-$(CONFIG_ACPID)             += acpid.o
 lib-$(CONFIG_BLKID)             += blkid.o
 lib-$(CONFIG_DMESG)             += dmesg.o
diff --git a/util-linux/volume_id/Kbuild.src b/util-linux/volume_id/Kbuild.src
index 3520f2480..8af3ccd81 100644
--- a/util-linux/volume_id/Kbuild.src
+++ b/util-linux/volume_id/Kbuild.src
@@ -6,6 +6,8 @@
 
 lib-y:=
 
+INSERT
+
 lib-$(CONFIG_BLKID)                             += get_devname.o
 lib-$(CONFIG_FINDFS)                            += get_devname.o
 lib-$(CONFIG_FEATURE_MOUNT_LABEL)               += get_devname.o
-- 
cgit v1.2.3-55-g6feb


From 7fdf5a88b4aaabb88624e66cd31d589a5b7280f6 Mon Sep 17 00:00:00 2001
From: Denys Vlasenko <vda.linux@googlemail.com>
Date: Wed, 9 Jun 2010 10:18:35 +0200
Subject: modinfo: needs modutils.o

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
---
 modutils/modinfo.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'modutils')

diff --git a/modutils/modinfo.c b/modutils/modinfo.c
index c68d2e974..321ad78f4 100644
--- a/modutils/modinfo.c
+++ b/modutils/modinfo.c
@@ -8,7 +8,7 @@
 
 //applet:IF_MODINFO(APPLET(modinfo, _BB_DIR_SBIN, _BB_SUID_DROP))
 
-//kbuild:lib-$(CONFIG_MODINFO) += modinfo.o
+//kbuild:lib-$(CONFIG_MODINFO) += modinfo.o modutils.o
 
 //config:config MODINFO
 //config:	bool "modinfo"
-- 
cgit v1.2.3-55-g6feb