diff options
| author |   Kevin Tian <kevin.tian@intel.com> | 2010-07-21 13:21:49 +0800 |
|---|---|---|
| committer |   Richard Purdie <rpurdie@linux.intel.com> | 2010-07-21 21:44:37 +0100 |
| commit | b376a803cac9c6403ce7ddf2a4a479292ec9ba85 (patch) | |
| tree | b642f0fbe43e030348858dde2c564b970d88d2d1 /meta/packages/module-init-tools/files/modutils_extension | |
| parent | 8a251accbfd68078fbab23a96411b76928cf1063 (diff) | |
| download | openembedded-core-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_extension | 55 |
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 @@ ---- module-init-tools-3.0-pre10.orig/depmod.c -+++ module-init-tools-3.0-pre10/depmod.c -@@ -217,13 +217,13 @@ - { - char *sep; - char pathname[strlen(argv[0])+1]; -- char oldname[strlen("depmod") + strlen(argv[0]) + sizeof(".old")]; -+ char oldname[strlen("depmod") + strlen(argv[0]) + sizeof(".24")]; - - memset(pathname, 0, strlen(argv[0])+1); - sep = strrchr(argv[0], '/'); - if (sep) - memcpy(pathname, argv[0], sep - argv[0]+1); -- sprintf(oldname, "%s%s.old", pathname, "depmod"); -+ sprintf(oldname, "%s%s.24", pathname, "depmod"); - - /* Recursion detection: we need an env var since we can't - change argv[0] (as older modutils uses it to determine ---- module-init-tools-3.0-pre10.orig/backwards_compat.c -+++ module-init-tools-3.0-pre10/backwards_compat.c -@@ -21,13 +21,13 @@ - pid_t pid; - char ascii_pid[32]; - char pathname[strlen(argv[0])+1]; -- char oldname[strlen(progname) + strlen(argv[0]) + sizeof(".old")]; -+ char oldname[strlen(progname) + strlen(argv[0]) + sizeof(".24")]; - - memset(pathname, 0, strlen(argv[0])+1); - sep = strrchr(argv[0], '/'); - if (sep) - memcpy(pathname, argv[0], sep - argv[0]+1); -- sprintf(oldname, "%s%s.old", pathname, progname); -+ sprintf(oldname, "%s%s.24", pathname, progname); - - /* Recursion detection: we need an env var since we can't - change argv[0] (as older modutils uses it to determine ---- module-init-tools-3.0-pre10.orig/generate-modprobe.conf -+++ module-init-tools-3.0-pre10/generate-modprobe.conf -@@ -26,12 +26,12 @@ - cp $TESTING_MODPROBE_CONF $MODPROBECONF - elif [ "$STDIN" = "1" ]; then - cat > $MODPROBECONF --elif [ -x /sbin/modprobe.old ]; then -+elif [ -x /sbin/modprobe.24 ]; then - # In sbin. -- /sbin/modprobe.old -c > $MODPROBECONF --elif modprobe.old -c >/dev/null 2>&1; then -+ /sbin/modprobe.24 -c > $MODPROBECONF -+elif modprobe.24 -c >/dev/null 2>&1; then - # Somewhere in path. -- modprobe.old -c > $MODPROBECONF -+ modprobe.24 -c > $MODPROBECONF - elif /sbin/modprobe -V 2>/dev/null | grep -q 'modprobe version'; then - # Running /sbin/modprobe gives old version. - /sbin/modprobe -c > $MODPROBECONF |