diff options
| author | Kristoffer Ericson <kristoffer_e1@hotmail.com> | 2006-07-07 00:54:21 +0000 |
|---|---|---|
| committer | OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2006-07-07 00:54:21 +0000 |
| commit | 0825e944345291cac5d45daae904c50a87389642 (patch) | |
| tree | fd5cb214d06e52a9ff2c4eafc1c1821dd5a6328a /packages/busybox/busybox-1.2.0/rmmod.patch | |
| parent | 5574fc5f3a610aefb6b90365108e10df38b5393f (diff) | |
| parent | a64033ce2a9d11b1336f7dee39203bbcee43f579 (diff) | |
merge of c1749e31b60b984658b557139430b4fe8eb432a7
and e1dfbc0aedf7759ad0b062d01ebcad3149da58f9
Diffstat (limited to 'packages/busybox/busybox-1.2.0/rmmod.patch')
| -rw-r--r-- | packages/busybox/busybox-1.2.0/rmmod.patch | 40 |
1 files changed, 40 insertions, 0 deletions
diff --git a/packages/busybox/busybox-1.2.0/rmmod.patch b/packages/busybox/busybox-1.2.0/rmmod.patch new file mode 100644 index 0000000000..20770e0dc4 --- /dev/null +++ b/packages/busybox/busybox-1.2.0/rmmod.patch @@ -0,0 +1,40 @@ +Index: busybox-1.1.0/modutils/rmmod.c +=================================================================== +--- busybox-1.1.0.orig/modutils/rmmod.c 2006-01-11 06:43:56.000000000 +0100 ++++ busybox-1.1.0/modutils/rmmod.c 2006-03-14 16:42:14.000000000 +0100 +@@ -29,6 +29,7 @@ + #include <string.h> + #include <sys/utsname.h> + #include <sys/syscall.h> ++#include <sys/utsname.h> + #include "busybox.h" + + #ifdef CONFIG_FEATURE_2_6_MODULES +@@ -64,6 +65,16 @@ + but must get */ + size_t bufsize = sizeof(bb_common_bufsiz1); + #endif ++#ifdef CONFIG_FEATURE_2_6_MODULES ++ int k_version = 0; ++ struct utsname myuname; ++ ++ if (uname(&myuname) == 0) { ++ if (myuname.release[0] == '2') { ++ k_version = myuname.release[2] - '0'; ++ } ++ } ++#endif + + /* Parse command line. */ + n = bb_getopt_ulflags(argc, argv, "wfa"); +@@ -109,6 +120,10 @@ + afterslash++; + module_name = alloca(strlen(afterslash) + 1); + filename2modname(module_name, afterslash); ++ if (k_version != 4) ++ filename2modname(module_name, afterslash); ++ else ++ strcpy(module_name, afterslash); + #else + #define module_name argv[n] + #endif |