← Commit list

1a5e11c87

Denys Vlasenko

2010-10-16

FAILED Duration: 395s

Subject

modutils/*: move help bits into corresponding .c files

Binary

No binary (build failed)

Architecture & Compiler Flags

Architecture: x86_64-linux-gnu Compiler: gcc (Ubuntu 11.4.0-1ubuntu1~22.04.3) 11.4.0

—

Build Log

(log yok)

Commit Diff GitHub →

include/usage.src.h +0 -20 modutils/depmod.c +5 -0 modutils/insmod.c +2 -0 modutils/lsmod.c +7 -0 modutils/modprobe-small.c +42 -1 modutils/rmmod.c +13 -0

include/usage.src.h+0 -20

@@ -751,9 +751,6 @@ INSERT
	#define deluser_full_usage "\n\n" \
	"Delete USER from the system"

-	#define depmod_trivial_usage NOUSAGE_STR
-	#define depmod_full_usage ""
-
	#define devmem_trivial_usage \
	"ADDRESS [WIDTH [VALUE]]"

@@ -2251,11 +2248,6 @@ INSERT
	"\n -l List long flag names" \
	"\n -v List the file's version/generation number" \

-	#define lsmod_trivial_usage \
-	""
-	#define lsmod_full_usage "\n\n" \
-	"List the currently loaded kernel modules"
-
	#define lspci_trivial_usage \
	"[-mk]"
	#define lspci_full_usage "\n\n" \
@@ -3256,18 +3248,6 @@ INSERT
	#define rmdir_example_usage \
	"# rmdir /tmp/foo\n"

-	#define rmmod_trivial_usage \
-	"[-wfa] [MODULE]..."
-	#define rmmod_full_usage "\n\n" \
-	"Unload kernel modules\n" \
-	"\nOptions:" \
-	"\n -w Wait until the module is no longer used" \
-	"\n -f Force unload" \
-	"\n -a Remove all unused modules (recursively)" \
-
-	#define rmmod_example_usage \
-	"$ rmmod tulip\n"
-
	#define route_trivial_usage \
	"[{add\|del\|delete}]"
	#define route_full_usage "\n\n" \

modutils/depmod.c+5 -0

@@ -10,6 +10,11 @@

	//applet:IF_DEPMOD(APPLET(depmod, _BB_DIR_SBIN, _BB_SUID_DROP))

+	//usage:#if !ENABLE_MODPROBE_SMALL
+	//usage:#define depmod_trivial_usage NOUSAGE_STR
+	//usage:#define depmod_full_usage ""
+	//usage:#endif
+
	#include "libbb.h"
	#include "modutils.h"
	#include <sys/utsname.h> /* uname() */

modutils/insmod.c+2 -0

@@ -15,6 +15,7 @@
	/* 2.6 style insmod has no options and required filename
	* (not module name - .ko can't be omitted) */

+	//usage:#if !ENABLE_MODPROBE_SMALL
	//usage:#define insmod_trivial_usage
	//usage: IF_FEATURE_2_4_MODULES("[OPTIONS] MODULE ")
	//usage: IF_NOT_FEATURE_2_4_MODULES("FILE ")
@@ -33,6 +34,7 @@
	//usage: )
	//usage: "\n -x Don't export externs"
	//usage: )
+	//usage:#endif

	int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
	int insmod_main(int argc UNUSED_PARAM, char **argv)

modutils/lsmod.c+7 -0

@@ -10,6 +10,13 @@

	//applet:IF_LSMOD(APPLET(lsmod, _BB_DIR_SBIN, _BB_SUID_DROP))

+	//usage:#if !ENABLE_MODPROBE_SMALL
+	//usage:#define lsmod_trivial_usage
+	//usage: ""
+	//usage:#define lsmod_full_usage "\n\n"
+	//usage: "List the currently loaded kernel modules"
+	//usage:#endif
+
	#include "libbb.h"
	#include "unicode.h"

modutils/modprobe-small.c+42 -1

@@ -694,6 +694,46 @@ The following options are useful for people managing distributions:
	*/

	//usage:#if ENABLE_MODPROBE_SMALL
+
+	//usage:#define depmod_trivial_usage NOUSAGE_STR
+	//usage:#define depmod_full_usage ""
+
+	//usage:#define lsmod_trivial_usage
+	//usage: ""
+	//usage:#define lsmod_full_usage "\n\n"
+	//usage: "List the currently loaded kernel modules"
+
+	//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: )
+
+	//usage:#define rmmod_trivial_usage
+	//usage: "[-wfa] [MODULE]..."
+	//usage:#define rmmod_full_usage "\n\n"
+	//usage: "Unload kernel modules\n"
+	//usage: "\nOptions:"
+	//usage: "\n -w Wait until the module is no longer used"
+	//usage: "\n -f Force unload"
+	//usage: "\n -a Remove all unused modules (recursively)"
+	//usage:
+	//usage:#define rmmod_example_usage
+	//usage: "$ rmmod tulip\n"
+
	//usage:#define modprobe_trivial_usage
	//usage: "[-qfwrsv] MODULE [symbol=value]..."
	//usage:#define modprobe_full_usage "\n\n"
@@ -704,7 +744,8 @@ The following options are useful for people managing distributions:
	//usage: "\n -f Force"
	//usage: "\n -w Wait for unload"
	//usage: "\n -s Report via syslog instead of stderr"
-	//usage:#endif /* ENABLE_MODPROBE_SMALL */
+
+	//usage:#endif

	int modprobe_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
	int modprobe_main(int argc UNUSED_PARAM, char **argv)

modutils/rmmod.c+13 -0

@@ -10,6 +10,19 @@

	//applet:IF_RMMOD(APPLET(rmmod, _BB_DIR_SBIN, _BB_SUID_DROP))

+	//usage:#if !ENABLE_MODPROBE_SMALL
+	//usage:#define rmmod_trivial_usage
+	//usage: "[-wfa] [MODULE]..."
+	//usage:#define rmmod_full_usage "\n\n"
+	//usage: "Unload kernel modules\n"
+	//usage: "\nOptions:"
+	//usage: "\n -w Wait until the module is no longer used"
+	//usage: "\n -f Force unload"
+	//usage: "\n -a Remove all unused modules (recursively)"
+	//usage:#define rmmod_example_usage
+	//usage: "$ rmmod tulip\n"
+	//usage:#endif
+
	#include "libbb.h"
	#include "modutils.h"