diff options
Diffstat (limited to 'modutils')
| -rw-r--r-- | modutils/Config.in | 62 | ||||
| -rw-r--r-- | modutils/Kbuild | 11 | ||||
| -rw-r--r-- | modutils/Makefile | 23 | ||||
| -rw-r--r-- | modutils/Makefile.in | 32 |
4 files changed, 42 insertions, 86 deletions
diff --git a/modutils/Config.in b/modutils/Config.in index 8974fb7..b28c66d 100644 --- a/modutils/Config.in +++ b/modutils/Config.in @@ -5,24 +5,24 @@ menu "Linux Module Utilities" -config CONFIG_INSMOD +config INSMOD bool "insmod" default n help insmod is used to load specified modules in the running kernel. -config CONFIG_FEATURE_INSMOD_VERSION_CHECKING +config FEATURE_INSMOD_VERSION_CHECKING bool "Module version checking" default n - depends on CONFIG_INSMOD && CONFIG_FEATURE_2_4_MODULES + depends on INSMOD && FEATURE_2_4_MODULES help Support checking of versions for modules. This is used to ensure that the kernel and module are made for each other. -config CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS +config FEATURE_INSMOD_KSYMOOPS_SYMBOLS bool "Add module symbols to kernel symbol table" default n - depends on CONFIG_INSMOD && CONFIG_FEATURE_2_4_MODULES + depends on INSMOD && FEATURE_2_4_MODULES help By adding module symbols to the kernel symbol table, Oops messages occuring within kernel modules can be properly debugged. By enabling @@ -30,20 +30,20 @@ config CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS table for properly debugging support. If you are not interested in Oops messages from kernel modules, say N. -config CONFIG_FEATURE_INSMOD_LOADINKMEM +config FEATURE_INSMOD_LOADINKMEM bool "In kernel memory optimization (uClinux only)" default n - depends on CONFIG_INSMOD && CONFIG_FEATURE_2_4_MODULES + depends on INSMOD && FEATURE_2_4_MODULES help This is a special uClinux only memory optimization that lets insmod load the specified kernel module directly into kernel space, reducing memory usage by preventing the need for two copies of the module being loaded into memory. -config CONFIG_FEATURE_INSMOD_LOAD_MAP +config FEATURE_INSMOD_LOAD_MAP bool "Enable load map (-m) option" default n - depends on CONFIG_INSMOD && CONFIG_FEATURE_2_4_MODULES + depends on INSMOD && FEATURE_2_4_MODULES help Enabling this, one would be able to get a load map output on stdout. This makes kernel module debugging @@ -51,36 +51,36 @@ config CONFIG_FEATURE_INSMOD_LOAD_MAP If you don't plan to debug kernel modules, you don't need this option. -config CONFIG_FEATURE_INSMOD_LOAD_MAP_FULL +config FEATURE_INSMOD_LOAD_MAP_FULL bool "Symbols in load map" default y - depends on CONFIG_FEATURE_INSMOD_LOAD_MAP + depends on FEATURE_INSMOD_LOAD_MAP help Without this option, -m will only output section load map. With this option, -m will also output symbols load map. -config CONFIG_RMMOD +config RMMOD bool "rmmod" default n help rmmod is used to unload specified modules from the kernel. -config CONFIG_LSMOD +config LSMOD bool "lsmod" default n help lsmod is used to display a list of loaded modules. -config CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT +config FEATURE_LSMOD_PRETTY_2_6_OUTPUT bool "lsmod pretty output for 2.6.x Linux kernels " default n - depends on CONFIG_LSMOD + depends on LSMOD help This option makes output format of lsmod adjusted to the format of module-init-tools for Linux kernel 2.6. -config CONFIG_MODPROBE +config MODPROBE bool "modprobe" default n help @@ -90,11 +90,11 @@ config CONFIG_MODPROBE Note that in the state, modprobe does not understand multiple module options from the configuration file. See option below. -config CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS +config FEATURE_MODPROBE_MULTIPLE_OPTIONS bool - prompt "Multiple options parsing" if CONFIG_NITPICK + prompt "Multiple options parsing" if NITPICK default y - depends on CONFIG_MODPROBE + depends on MODPROBE help Allow modprobe to understand more than one option to pass to modules. @@ -107,51 +107,51 @@ config CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS Saying Y here is not a bad idea if you're not that short on storage capacity. -config CONFIG_FEATURE_MODPROBE_FANCY_ALIAS +config FEATURE_MODPROBE_FANCY_ALIAS bool - prompt "Fancy alias parsing" if CONFIG_NITPICK + prompt "Fancy alias parsing" if NITPICK default y - depends on CONFIG_MODPROBE && CONFIG_FEATURE_2_6_MODULES + depends on MODPROBE && FEATURE_2_6_MODULES help Say 'y' here to enable parsing of aliases with underscore/dash mismatch between module name and file name, along with bus-specific aliases (such as pci:... or usb:... aliases). comment "Options common to multiple modutils" - depends on CONFIG_INSMOD || CONFIG_RMMOD || CONFIG_MODPROBE || CONFIG_LSMOD + depends on INSMOD || RMMOD || MODPROBE || LSMOD -config CONFIG_FEATURE_CHECK_TAINTED_MODULE +config FEATURE_CHECK_TAINTED_MODULE # Simulate indentation bool "Support tainted module checking with new kernels" default y - depends on CONFIG_INSMOD || CONFIG_LSMOD + depends on INSMOD || LSMOD help Support checking for tainted modules. These are usually binary only modules that will make the linux-kernel list ignore your support request. This option is required to support GPLONLY modules. -config CONFIG_FEATURE_2_4_MODULES +config FEATURE_2_4_MODULES # Simulate indentation bool "Support version 2.2.x to 2.4.x Linux kernels" default y - depends on CONFIG_INSMOD || CONFIG_RMMOD + depends on INSMOD || RMMOD help Support module loading for 2.2.x and 2.4.x Linux kernels. -config CONFIG_FEATURE_2_6_MODULES +config FEATURE_2_6_MODULES # Simulate indentation bool "Support version 2.6.x Linux kernels" default y - depends on CONFIG_INSMOD || CONFIG_RMMOD || CONFIG_MODPROBE + depends on INSMOD || RMMOD || MODPROBE help Support module loading for newer 2.6.x Linux kernels. -config CONFIG_FEATURE_QUERY_MODULE_INTERFACE +config FEATURE_QUERY_MODULE_INTERFACE bool default y - depends on CONFIG_FEATURE_2_4_MODULES && !CONFIG_FEATURE_2_6_MODULES + depends on FEATURE_2_4_MODULES && !FEATURE_2_6_MODULES endmenu diff --git a/modutils/Kbuild b/modutils/Kbuild new file mode 100644 index 0000000..cff02b4 --- /dev/null +++ b/modutils/Kbuild @@ -0,0 +1,11 @@ +# Makefile for busybox +# +# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> +# +# Licensed under the GPL v2, see the file LICENSE in this tarball. + +lib-y:= +lib-$(CONFIG_INSMOD) += insmod.o +lib-$(CONFIG_LSMOD) += lsmod.o +lib-$(CONFIG_MODPROBE) += modprobe.o +lib-$(CONFIG_RMMOD) += rmmod.o diff --git a/modutils/Makefile b/modutils/Makefile deleted file mode 100644 index 65090c5..0000000 --- a/modutils/Makefile +++ /dev/null @@ -1,23 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> -# -# Licensed under the GPL v2, see the file LICENSE in this tarball. - -ifndef top_srcdir -top_srcdir=.. -endif -ifndef top_builddir -top_builddir=.. -endif -srcdir=$(top_srcdir)/modutils -MODUTILS_DIR:=./ -include $(top_srcdir)/Rules.mak -include $(top_builddir)/.config -include Makefile.in -all: $(libraries-y) --include $(top_builddir)/.depend - -clean: - rm -f *.o *.a $(AR_TARGET) - diff --git a/modutils/Makefile.in b/modutils/Makefile.in deleted file mode 100644 index 5c7c923..0000000 --- a/modutils/Makefile.in +++ /dev/null @@ -1,32 +0,0 @@ -# Makefile for busybox -# -# Copyright (C) 1999-2005 by Erik Andersen <andersen@codepoet.org> -# -# Licensed under the GPL v2, see the file LICENSE in this tarball. - -MODUTILS_AR:=modutils.a -ifndef $(MODUTILS_DIR) -MODUTILS_DIR:=$(top_builddir)/modutils/ -endif -srcdir=$(top_srcdir)/modutils - -MODUTILS-y:= -MODUTILS-$(CONFIG_INSMOD) += insmod.o -MODUTILS-$(CONFIG_LSMOD) += lsmod.o -MODUTILS-$(CONFIG_MODPROBE) += modprobe.o -MODUTILS-$(CONFIG_RMMOD) += rmmod.o - -ifneq ($(strip $(MODUTILS-y)),) -libraries-y+=$(MODUTILS_DIR)$(MODUTILS_AR) -endif - -MODUTILS_SRC-y:=$(patsubst %.o,$(srcdir)/%.c,$(MODUTILS-y)) -MODUTILS_SRC-a:=$(wildcard $(srcdir)/*.c) -APPLET_SRC-y+=$(MODUTILS_SRC-y) -APPLET_SRC-a+=$(MODUTILS_SRC-a) - -$(MODUTILS_DIR)$(MODUTILS_AR): $(patsubst %,$(MODUTILS_DIR)%, $(MODUTILS-y)) - $(do_ar) - -$(MODUTILS_DIR)%.o: $(srcdir)/%.c - $(compile.c) |