summaryrefslogtreecommitdiffstats
path: root/meta/packages/module-init-tools/files/modutils_extension
diff options
context:
space:
mode:
authorKevin Tian <kevin.tian@intel.com>2010-07-21 13:21:49 +0800
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-21 21:44:37 +0100
commitb376a803cac9c6403ce7ddf2a4a479292ec9ba85 (patch)
treeb642f0fbe43e030348858dde2c564b970d88d2d1 /meta/packages/module-init-tools/files/modutils_extension
parent8a251accbfd68078fbab23a96411b76928cf1063 (diff)
downloadpoky-b376a803cac9c6403ce7ddf2a4a479292ec9ba85.tar.gz
module-init-tools: upgrade to 3.12
[Patches] KEEP _ignore_arch_directory_: ignore /etc/modprobe.d/arch, not sure reason now. keep it and to be verified later REMOVE _module-init-tools-remove-index.patch_: in upstream NEW _disable_man.patch_: a simpler patch to replace below removed two REMOVE _manpagesopt_: due to above new patch REMOVE _no_man_rebuild_: ditto KEEP _modutils_extension_: poky has its own name convention and thus need such knowledge in code [Recipe] - adjust indention - remove some old lines like ${S} and EXTRA_OECONF Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/module-init-tools/files/modutils_extension')
-rw-r--r--meta/packages/module-init-tools/files/modutils_extension55
1 files changed, 0 insertions, 55 deletions
diff --git a/meta/packages/module-init-tools/files/modutils_extension b/meta/packages/module-init-tools/files/modutils_extension
deleted file mode 100644
index fd84ca2550..0000000000
--- a/meta/packages/module-init-tools/files/modutils_extension
+++ /dev/null
@@ -1,55 +0,0 @@
1--- module-init-tools-3.0-pre10.orig/depmod.c
2+++ module-init-tools-3.0-pre10/depmod.c
3@@ -217,13 +217,13 @@
4 {
5 char *sep;
6 char pathname[strlen(argv[0])+1];
7- char oldname[strlen("depmod") + strlen(argv[0]) + sizeof(".old")];
8+ char oldname[strlen("depmod") + strlen(argv[0]) + sizeof(".24")];
9
10 memset(pathname, 0, strlen(argv[0])+1);
11 sep = strrchr(argv[0], '/');
12 if (sep)
13 memcpy(pathname, argv[0], sep - argv[0]+1);
14- sprintf(oldname, "%s%s.old", pathname, "depmod");
15+ sprintf(oldname, "%s%s.24", pathname, "depmod");
16
17 /* Recursion detection: we need an env var since we can't
18 change argv[0] (as older modutils uses it to determine
19--- module-init-tools-3.0-pre10.orig/backwards_compat.c
20+++ module-init-tools-3.0-pre10/backwards_compat.c
21@@ -21,13 +21,13 @@
22 pid_t pid;
23 char ascii_pid[32];
24 char pathname[strlen(argv[0])+1];
25- char oldname[strlen(progname) + strlen(argv[0]) + sizeof(".old")];
26+ char oldname[strlen(progname) + strlen(argv[0]) + sizeof(".24")];
27
28 memset(pathname, 0, strlen(argv[0])+1);
29 sep = strrchr(argv[0], '/');
30 if (sep)
31 memcpy(pathname, argv[0], sep - argv[0]+1);
32- sprintf(oldname, "%s%s.old", pathname, progname);
33+ sprintf(oldname, "%s%s.24", pathname, progname);
34
35 /* Recursion detection: we need an env var since we can't
36 change argv[0] (as older modutils uses it to determine
37--- module-init-tools-3.0-pre10.orig/generate-modprobe.conf
38+++ module-init-tools-3.0-pre10/generate-modprobe.conf
39@@ -26,12 +26,12 @@
40 cp $TESTING_MODPROBE_CONF $MODPROBECONF
41 elif [ "$STDIN" = "1" ]; then
42 cat > $MODPROBECONF
43-elif [ -x /sbin/modprobe.old ]; then
44+elif [ -x /sbin/modprobe.24 ]; then
45 # In sbin.
46- /sbin/modprobe.old -c > $MODPROBECONF
47-elif modprobe.old -c >/dev/null 2>&1; then
48+ /sbin/modprobe.24 -c > $MODPROBECONF
49+elif modprobe.24 -c >/dev/null 2>&1; then
50 # Somewhere in path.
51- modprobe.old -c > $MODPROBECONF
52+ modprobe.24 -c > $MODPROBECONF
53 elif /sbin/modprobe -V 2>/dev/null | grep -q 'modprobe version'; then
54 # Running /sbin/modprobe gives old version.
55 /sbin/modprobe -c > $MODPROBECONF