libkmod: provide modprobe, etc. tools

Also fix module-init-tools to avoid conflicts. kmod is the future, so it
has priority over module-init-tools.

Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

3 files changed, 103 insertions, 11 deletions

diff --git a/rules/libkmod.in b/rules/libkmod.in
index eccc6292c..4d5a9d8ff 100644
--- a/rules/libkmod.in
+++ b/rules/libkmod.in
@@ -13,10 +13,69 @@ if LIBKMOD
 
 config LIBKMOD_TOOLS
 	bool
-	prompt "install tools"
+
+config LIBKMOD_INSMOD
+	bool
+	prompt "Install insmod"
+	depends on !BUSYBOX_INSMOD || ALLYES
+	select LIBKMOD_TOOLS
+	help
+	  simple program to insert a module into the Linux Kernel
+
+comment "BusyBox' insmod is selected!"
+	depends on BUSYBOX_INSMOD
+
+config LIBKMOD_RMMOD
+	bool
+	prompt "Install rmmod"
+	depends on !BUSYBOX_RMMOD || ALLYES
+	select LIBKMOD_TOOLS
+	help
+	  simple program to remove a module from the Linux Kernel
+
+comment "BusyBox' rmmod is selected!"
+	depends on BUSYBOX_RMMOD
+
+config LIBKMOD_LSMOD
+	bool
+	prompt "Install lsmod"
+	depends on !BUSYBOX_LSMOD || ALLYES
+	select LIBKMOD_TOOLS
+	help
+	  program to show the status of modules in the Linux Kernel
+
+comment "BusyBox' lsmod is selected!"
+	depends on BUSYBOX_LSMOD
+
+config LIBKMOD_MODINFO
+	bool
+	prompt "Install modinfo"
+	depends on !BUSYBOX_MODINFO || ALLYES
+	select LIBKMOD_TOOLS
+	help
+	  program to show information about a Linux Kernel module
+
+comment "BusyBox' modinfo is selected!"
+	depends on BUSYBOX_MODINFO
+
+config LIBKMOD_MODPROBE
+	bool
+	prompt "Install modprobe"
+	depends on !BUSYBOX_MODPROBE || ALLYES
+	select LIBKMOD_TOOLS
+	help
+	  program to add and remove modules from the Linux Kernel
+
+comment "BusyBox' modprobe is selected!"
+	depends on BUSYBOX_MODPROBE
+
+config LIBKMOD_DEPMOD
+	bool
+	prompt "Install depmod"
+	depends on !BUSYBOX_DEPMOD || ALLYES
+	select LIBKMOD_TOOLS
 	help
-	  Install tool frontends that provide same functionality as the
-	  module-init-tools
+	  program to generate modules.dep and map files
 
 config LIBKMOD_ZLIB
 	bool
diff --git a/rules/libkmod.make b/rules/libkmod.make
index aa48c1201..9cdb21c97 100644
--- a/rules/libkmod.make
+++ b/rules/libkmod.make
@@ -32,7 +32,7 @@ LIBKMOD_LICENSE	:= GPLv2/LGPLv2
 
 LIBKMOD_CONF_TOOL	:= autoconf
 LIBKMOD_CONF_OPT	:= \
-	$(CROSS_AUTOCONF_USR) \
+	$(CROSS_AUTOCONF_ROOT) \
 	$(GLOBAL_LARGE_FILE_OPTION) \
 	--disable-static \
 	--enable-shared \
@@ -61,7 +61,25 @@ $(STATEDIR)/libkmod.targetinstall:
 	@$(call install_lib, libkmod, 0, 0, 0644, libkmod)
 
 ifdef PTXCONF_LIBKMOD_TOOLS
-	@$(call install_copy, libkmod, 0, 0, 0755, -, /usr/bin/kmod)
+	@$(call install_copy, libkmod, 0, 0, 0755, -, /bin/kmod)
+ifdef PTXCONF_LIBKMOD_INSMOD
+	@$(call install_link, libkmod, ../bin/kmod, /sbin/insmod)
+endif
+ifdef PTXCONF_LIBKMOD_RMMOD
+	@$(call install_link, libkmod, ../bin/kmod, /sbin/rmmod)
+endif
+ifdef PTXCONF_LIBKMOD_LSMOD
+	@$(call install_link, libkmod, kmod, /bin/lsmod)
+endif
+ifdef PTXCONF_LIBKMOD_MODINFO
+	@$(call install_link, libkmod, ../bin/kmod, /sbin/modinfo)
+endif
+ifdef PTXCONF_LIBKMOD_MODPROBE
+	@$(call install_link, libkmod, ../bin/kmod, /sbin/modprobe)
+endif
+ifdef PTXCONF_LIBKMOD_DEPMOD
+	@$(call install_link, libkmod, ../bin/kmod, /sbin/depmod)
+endif
 endif
 	@$(call install_finish, libkmod)
 
diff --git a/rules/module-init-tools.in b/rules/module-init-tools.in
index 6740e1b01..765de6b97 100644
--- a/rules/module-init-tools.in
+++ b/rules/module-init-tools.in
@@ -14,57 +14,72 @@ if MODULE_INIT_TOOLS
 config MODULE_INIT_TOOLS_INSMOD
 	bool
 	prompt "Install insmod on target"
-	depends on !BUSYBOX_INSMOD || ALLYES
+	depends on (!BUSYBOX_INSMOD && !LIBKMOD_INSMOD) || ALLYES
 	help
 	  simple program to insert a module into the Linux Kernel
 
 comment "BusyBox' insmod is selected!"
 	depends on BUSYBOX_INSMOD
 
+comment "kmod insmod is selected!"
+	depends on LIBKMOD_INSMOD
+
 config MODULE_INIT_TOOLS_RMMOD
 	bool
 	prompt "Install rmmod on target"
-	depends on !BUSYBOX_RMMOD || ALLYES
+	depends on (!BUSYBOX_RMMOD && !LIBKMOD_RMMOD) || ALLYES
 	help
 	  simple program to remove a module from the Linux Kernel
 
 comment "BusyBox' rmmod is selected!"
 	depends on BUSYBOX_RMMOD
 
+comment "kmod rmmod is selected!"
+	depends on LIBKMOD_RMMOD
+
 config MODULE_INIT_TOOLS_LSMOD
 	bool
 	prompt "Install lsmod on target"
-	depends on !BUSYBOX_LSMOD || ALLYES
+	depends on (!BUSYBOX_LSMOD && !LIBKMOD_LSMOD) || ALLYES
 	help
 	  program to show the status of modules in the Linux Kernel
 
 comment "BusyBox' lsmod is selected!"
 	depends on BUSYBOX_LSMOD
 
+comment "kmod lsmod is selected!"
+	depends on LIBKMOD_LSMOD
+
 config MODULE_INIT_TOOLS_MODINFO
 	bool
 	prompt "Install modinfo on target"
-	depends on !BUSYBOX_MODINFO || ALLYES
+	depends on (!BUSYBOX_MODINFO && !LIBKMOD_MODINFO) || ALLYES
 	help
 	  program to show information about a Linux Kernel module
 
 comment "BusyBox' modinfo is selected!"
 	depends on BUSYBOX_MODINFO
 
+comment "kmod modinfo is selected!"
+	depends on LIBKMOD_MODINFO
+
 config MODULE_INIT_TOOLS_MODPROBE
 	bool
 	prompt "Install modprobe on target"
-	depends on !BUSYBOX_MODPROBE || ALLYES
+	depends on (!BUSYBOX_MODPROBE && !LIBKMOD_MODPROBE) || ALLYES
 	help
 	  program to add and remove modules from the Linux Kernel
 
 comment "BusyBox' modprobe is selected!"
 	depends on BUSYBOX_MODPROBE
 
+comment "kmod modprobe is selected!"
+	depends on LIBKMOD_MODPROBE
+
 config MODULE_INIT_TOOLS_DEPMOD
 	bool
 	prompt "Install depmod on target"
-	depends on !BUSYBOX_DEPMOD || ALLYES
+	depends on (!BUSYBOX_DEPMOD && !LIBKMOD_DEPMOD) || ALLYES
 	help
 	  program to generate modules.dep and map files