diff options
author | Khem Raj <raj.khem@gmail.com> | 2012-01-31 00:34:28 -0800 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2012-05-07 16:42:47 +0100 |
commit | 884c7c6eee8e6116c1a9b9ebb0e07c1e103895fb (patch) | |
tree | 1e3f720de51c6b71db1f24cf0dac8ce1a94afb68 /meta/recipes-kernel/module-init-tools/files | |
parent | bc2c2fe1f6d9952aa7f6de2a461011238568e341 (diff) | |
download | poky-884c7c6eee8e6116c1a9b9ebb0e07c1e103895fb.tar.gz |
module-init-tools: Delete
Since its provided by kmod
(From OE-Core rev: 27bc204010b9dccb30847d7b3216f8b1e106f64e)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-kernel/module-init-tools/files')
5 files changed, 0 insertions, 115 deletions
diff --git a/meta/recipes-kernel/module-init-tools/files/PD.patch b/meta/recipes-kernel/module-init-tools/files/PD.patch deleted file mode 100644 index 21ac49cbd8..0000000000 --- a/meta/recipes-kernel/module-init-tools/files/PD.patch +++ /dev/null | |||
@@ -1,8 +0,0 @@ | |||
1 | Upstream-Status: Inappropriate [licensing] | ||
2 | |||
3 | Index: modutils-initscripts-1.0/LICENSE | ||
4 | =================================================================== | ||
5 | --- /dev/null 1970-01-01 00:00:00.000000000 +0000 | ||
6 | +++ modutils-initscripts-1.0/LICENSE 2010-12-06 14:26:03.570339002 -0800 | ||
7 | @@ -0,0 +1 @@ | ||
8 | +Public Domain | ||
diff --git a/meta/recipes-kernel/module-init-tools/files/disable_man.patch b/meta/recipes-kernel/module-init-tools/files/disable_man.patch deleted file mode 100644 index 95ad9cf92f..0000000000 --- a/meta/recipes-kernel/module-init-tools/files/disable_man.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | # disable man page build | ||
2 | # | ||
3 | # by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 | ||
4 | |||
5 | Upstream-Status: Inappropriate [disable feature] | ||
6 | |||
7 | diff --git a/Makefile.am b/Makefile.am | ||
8 | index 6f83c12..32972a8 100644 | ||
9 | --- a/Makefile.am | ||
10 | +++ b/Makefile.am | ||
11 | @@ -39,13 +39,12 @@ modindex_LDADD = $(LDADD) libmodtools.a | ||
12 | MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5 modprobe.d.5 | ||
13 | MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 | ||
14 | SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) | ||
15 | -dist_man_MANS = $(MAN5) $(MAN8) | ||
16 | # If they haven't overridden mandir, fix it (never /man!) | ||
17 | mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) | ||
18 | |||
19 | TESTSUITE := $(shell test -e @srcdir@/tests && find @srcdir@/tests -type f ! -name '*~') | ||
20 | |||
21 | -EXTRA_DIST = generate-modprobe.conf FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE) | ||
22 | +EXTRA_DIST = generate-modprobe.conf FAQ CODING stress_modules.sh install-with-care | ||
23 | |||
24 | sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo | ||
25 | if BUILD_STATIC_UTILS | ||
diff --git a/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch b/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch deleted file mode 100644 index 31dc0e96b0..0000000000 --- a/meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch +++ /dev/null | |||
@@ -1,21 +0,0 @@ | |||
1 | # this patch is from Mark Hatle <mark.hatle@windriver.com>, who ran into | ||
2 | # a random segfault using the latest module-init-tools (3.12) and finally | ||
3 | # trace back to depmod.c:grab_module, which appears that the new malloc(...) | ||
4 | # setups up things, but never clears the memory that was just allocated. | ||
5 | # | ||
6 | # Kevin Tian <kevin.tian@intel.com>, 2010-08-06 | ||
7 | |||
8 | Upstream-Status: Pending | ||
9 | |||
10 | diff --git a/depmod.c b/depmod.c | ||
11 | index 647e5e6..46e03e0 100644 | ||
12 | --- a/depmod.c | ||
13 | +++ b/depmod.c | ||
14 | @@ -313,6 +313,7 @@ static struct module *grab_module(const char *dirname, const char *filename) | ||
15 | |||
16 | new = NOFAIL(malloc(sizeof(*new) | ||
17 | + strlen(dirname?:"") + 1 + strlen(filename) + 1)); | ||
18 | + memset(new, 0x00, sizeof(*new) + strlen(dirname?:"") + 1 + strlen(filename) + 1); | ||
19 | if (dirname) | ||
20 | sprintf(new->pathname, "%s/%s", dirname, filename); | ||
21 | else | ||
diff --git a/meta/recipes-kernel/module-init-tools/files/modutils.sh b/meta/recipes-kernel/module-init-tools/files/modutils.sh deleted file mode 100755 index 9049bbb8aa..0000000000 --- a/meta/recipes-kernel/module-init-tools/files/modutils.sh +++ /dev/null | |||
@@ -1,36 +0,0 @@ | |||
1 | #!/bin/sh | ||
2 | ### BEGIN INIT INFO | ||
3 | # Provides: module-init-tools | ||
4 | # Required-Start: | ||
5 | # Required-Stop: | ||
6 | # Should-Start: checkroot | ||
7 | # Should-stop: | ||
8 | # Default-Start: S | ||
9 | # Default-Stop: | ||
10 | # Short-Description: Process /etc/modules. | ||
11 | # Description: Load the modules listed in /etc/modules. | ||
12 | ### END INIT INFO | ||
13 | |||
14 | LOAD_MODULE=modprobe | ||
15 | [ -f /proc/modules ] || exit 0 | ||
16 | [ -f /etc/modules ] || exit 0 | ||
17 | [ -e /sbin/modprobe ] || LOAD_MODULE=insmod | ||
18 | |||
19 | if [ ! -f /lib/modules/`uname -r`/modules.dep ]; then | ||
20 | [ "$VERBOSE" != no ] && echo "Calculating module dependencies ..." | ||
21 | depmod -Ae | ||
22 | fi | ||
23 | |||
24 | [ "$VERBOSE" != no ] && echo -n "Loading modules: " | ||
25 | (cat /etc/modules; echo; ) | | ||
26 | while read module args | ||
27 | do | ||
28 | case "$module" in | ||
29 | \#*|"") continue ;; | ||
30 | esac | ||
31 | [ "$VERBOSE" != no ] && echo -n "$module " | ||
32 | eval "$LOAD_MODULE $module $args >/dev/null 2>&1" | ||
33 | done | ||
34 | [ "$VERBOSE" != no ] && echo | ||
35 | |||
36 | exit 0 | ||
diff --git a/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch b/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch deleted file mode 100644 index 4a6e0fedcc..0000000000 --- a/meta/recipes-kernel/module-init-tools/files/modutils_extension.patch +++ /dev/null | |||
@@ -1,25 +0,0 @@ | |||
1 | # poky uses new name to differentiate from modutils, so reflect this new name in source | ||
2 | # | ||
3 | # comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 | ||
4 | |||
5 | Upstream-Status: Inappropriate [embedded specific] | ||
6 | |||
7 | --- module-init-tools-3.0-pre10.orig/generate-modprobe.conf | ||
8 | +++ module-init-tools-3.0-pre10/generate-modprobe.conf | ||
9 | @@ -45,12 +45,12 @@ | ||
10 | cp $TESTING_MODPROBE_CONF $MODPROBECONF | ||
11 | elif [ "$STDIN" = "1" ]; then | ||
12 | cat > $MODPROBECONF | ||
13 | -elif [ -x /sbin/modprobe.old ]; then | ||
14 | +elif [ -x /sbin/modprobe.24 ]; then | ||
15 | # In sbin. | ||
16 | - /sbin/modprobe.old -c > $MODPROBECONF || modprobe_abort | ||
17 | -elif modprobe.old -c >/dev/null 2>&1; then | ||
18 | + /sbin/modprobe.24 -c > $MODPROBECONF || modprobe_abort | ||
19 | +elif modprobe.24 -c >/dev/null 2>&1; then | ||
20 | # Somewhere in path. | ||
21 | - modprobe.old -c > $MODPROBECONF || modprobe_abort | ||
22 | + modprobe.24 -c > $MODPROBECONF || modprobe_abort | ||
23 | elif /sbin/modprobe -V 2>/dev/null | grep -q 'modprobe version'; then | ||
24 | # Running /sbin/modprobe gives old version. | ||
25 | /sbin/modprobe -c > $MODPROBECONF || modprobe_abort | ||