diff options
author | Richard Purdie <richard@openedhand.com> | 2006-05-09 17:44:12 +0000 |
---|---|---|
committer | Richard Purdie <richard@openedhand.com> | 2006-05-09 17:44:12 +0000 |
commit | c4aeea061cef9be1956614b2654e1a7a0150b895 (patch) | |
tree | c946daa5fbd2ff9618d6abcdea47dfdce04bfe8a /openembedded/packages/busybox/busybox-1.00/rmmod.patch | |
parent | d097b90ed729456b685e457c99ac9c64f96e214c (diff) | |
download | openembedded-core-c4aeea061cef9be1956614b2654e1a7a0150b895.tar.gz openembedded-core-c4aeea061cef9be1956614b2654e1a7a0150b895.tar.bz2 openembedded-core-c4aeea061cef9be1956614b2654e1a7a0150b895.tar.xz openembedded-core-c4aeea061cef9be1956614b2654e1a7a0150b895.zip |
busybox 1.00 -> 1.01
git-svn-id: https://svn.o-hand.com/repos/poky/trunk@384 311d38ba-8fff-0310-9ca6-ca027cbcb966
Diffstat (limited to 'openembedded/packages/busybox/busybox-1.00/rmmod.patch')
-rw-r--r-- | openembedded/packages/busybox/busybox-1.00/rmmod.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/openembedded/packages/busybox/busybox-1.00/rmmod.patch b/openembedded/packages/busybox/busybox-1.00/rmmod.patch deleted file mode 100644 index 5a557ef35..000000000 --- a/openembedded/packages/busybox/busybox-1.00/rmmod.patch +++ /dev/null @@ -1,44 +0,0 @@ -Index: modutils/rmmod.c -=================================================================== -RCS file: /var/cvs/busybox/modutils/rmmod.c,v -retrieving revision 1.31 -diff -u -r1.31 rmmod.c ---- busybox/modutils/rmmod.c 20 Jul 2004 18:36:51 -0000 1.31 -+++ busybox/modutils/rmmod.c 10 Dec 2004 22:56:36 -0000 -@@ -28,6 +28,7 @@ - #include <fcntl.h> - #include <string.h> - #include <sys/syscall.h> -+#include <sys/utsname.h> - #include "busybox.h" - - #ifdef CONFIG_FEATURE_2_6_MODULES -@@ -63,6 +64,16 @@ - void *buf; /* hold the module names which we ignore but must get */ - size_t bufsize = 0; - #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. */ - while ((n = getopt(argc, argv, "a")) != EOF) { -@@ -109,7 +120,10 @@ - for (n = optind; n < argc; n++) { - #ifdef CONFIG_FEATURE_2_6_MODULES - char module_name[strlen(argv[n]) + 1]; -- filename2modname(module_name, argv[n]); -+ if (k_version != 4) -+ filename2modname(module_name, argv[n]); -+ else -+ strcpy(module_name, argv[n]); - #else - #define module_name argv[n] - #endif |