X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=package%2Fbusybox%2Fpatches%2F470-insmod_search.patch;h=ef170a20c8607f49b49fbfc3c596aeab0bc99e94;hb=da7c2e1d7d4e640f57fadd23346084054a6184df;hp=6f2da661bf0971ffe6513bcba9c88276959b3d9e;hpb=8be628f50a9626ad6a3b44df9f1b84dc4e01394f;p=openwrt%2Fstaging%2Fyousong.git

diff --git a/package/busybox/patches/470-insmod_search.patch b/package/busybox/patches/470-insmod_search.patch
index 6f2da661bf..ef170a20c8 100644
--- a/package/busybox/patches/470-insmod_search.patch
+++ b/package/busybox/patches/470-insmod_search.patch
@@ -98,9 +98,9 @@
 +	return ret;
 +}
  
- int insmod_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
- int insmod_main(int argc UNUSED_PARAM, char **argv)
-@@ -33,9 +126,15 @@ int insmod_main(int argc UNUSED_PARAM, c
+ /* 2.6 style insmod has no options and required filename
+  * (not module name - .ko can't be omitted) */
+@@ -55,9 +148,15 @@ int insmod_main(int argc UNUSED_PARAM, c
  	if (!filename)
  		bb_show_usage();
  
@@ -117,14 +117,14 @@
 +done:
  	return rc;
  }
---- a/modutils/Config.in
-+++ b/modutils/Config.in
-@@ -226,7 +226,7 @@ config FEATURE_MODUTILS_SYMBOLS
+--- a/modutils/Config.src
++++ b/modutils/Config.src
+@@ -228,7 +228,7 @@ config FEATURE_MODUTILS_SYMBOLS
  config DEFAULT_MODULES_DIR
  	string "Default directory containing modules"
  	default "/lib/modules"
--	depends on DEPMOD || MODPROBE || MODPROBE_SMALL
-+	depends on DEPMOD || INSMOD || MODPROBE || MODPROBE_SMALL
+-	depends on DEPMOD || MODPROBE || MODPROBE_SMALL || MODINFO
++	depends on DEPMOD || MODPROBE || MODPROBE_SMALL || MODINFO || INSMOD
  	help
  	  Directory that contains kernel modules.
  	  Defaults to "/lib/modules"