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 | |
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>
-rw-r--r-- | meta/recipes-kernel/module-init-tools/files/disable_man.patch | 25 | ||||
-rw-r--r-- | meta/recipes-kernel/module-init-tools/files/grab_module_memset.patch | 21 | ||||
-rw-r--r-- | meta/recipes-kernel/module-init-tools/files/modutils_extension.patch | 25 | ||||
-rw-r--r-- | meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb | 10 | ||||
-rw-r--r-- | meta/recipes-kernel/module-init-tools/module-init-tools.inc | 24 | ||||
-rw-r--r-- | meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb | 42 | ||||
-rw-r--r-- | meta/recipes-kernel/modutils-initscripts/files/PD.patch (renamed from meta/recipes-kernel/module-init-tools/files/PD.patch) | 0 | ||||
-rwxr-xr-x | meta/recipes-kernel/modutils-initscripts/files/modutils.sh (renamed from meta/recipes-kernel/module-init-tools/files/modutils.sh) | 0 | ||||
-rw-r--r-- | meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb (renamed from meta/recipes-kernel/module-init-tools/modutils-initscripts.bb) | 0 |
9 files changed, 0 insertions, 147 deletions
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_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 | ||
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb deleted file mode 100644 index dee163da4f..0000000000 --- a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb +++ /dev/null | |||
@@ -1,10 +0,0 @@ | |||
1 | require module-init-tools.inc | ||
2 | PR = "r0" | ||
3 | inherit cross | ||
4 | PROVIDES += "virtual/${TARGET_PREFIX}depmod" | ||
5 | RDEPENDS_${PN} = "" | ||
6 | |||
7 | SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5" | ||
8 | SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b" | ||
9 | |||
10 | EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX} --disable-static-utils" | ||
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools.inc b/meta/recipes-kernel/module-init-tools/module-init-tools.inc deleted file mode 100644 index c290c4f7fb..0000000000 --- a/meta/recipes-kernel/module-init-tools/module-init-tools.inc +++ /dev/null | |||
@@ -1,24 +0,0 @@ | |||
1 | SUMMARY = "Kernel Module Utilities" | ||
2 | DESCRIPTION = "This package contains a set of programs for loading, inserting, and removing kernel modules for Linux (versions 2.5.48 and above). It serves the same function that the modutils package serves for Linux 2.4" | ||
3 | LICENSE = "GPLv2+" | ||
4 | LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ | ||
5 | file://lsmod.c;md5=743c873ec42632d2ce37d3c440f366dd" | ||
6 | SECTION = "base" | ||
7 | |||
8 | PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod" | ||
9 | RDEPENDS_${PN} += "module-init-tools-depmod" | ||
10 | |||
11 | FILES_module-init-tools-depmod = "${sbindir}/depmod.26" | ||
12 | FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" | ||
13 | |||
14 | SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ | ||
15 | file://modutils_extension.patch \ | ||
16 | file://disable_man.patch \ | ||
17 | file://grab_module_memset.patch" | ||
18 | |||
19 | inherit autotools | ||
20 | |||
21 | # module-init-tools uses AX_ENABLE_BUILDDIR to move rest of configuration steps | ||
22 | # into a subdir. However this macro is not quite cross friendly. Instead of | ||
23 | # mangling that macro, a easier way is to take the disable option | ||
24 | EXTRA_OECONF = "--disable-builddir" | ||
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb b/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb deleted file mode 100644 index 0248b464c1..0000000000 --- a/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | require module-init-tools.inc | ||
2 | PR = "r0" | ||
3 | |||
4 | # autotools set prefix to /usr, however we want them in /bin and /sbin | ||
5 | bindir = "/bin" | ||
6 | sbindir = "/sbin" | ||
7 | |||
8 | do_install() { | ||
9 | autotools_do_install | ||
10 | for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do | ||
11 | mv ${D}/$f ${D}/$f.26 | ||
12 | done | ||
13 | } | ||
14 | |||
15 | pkg_postinst_module-init-tools() { | ||
16 | for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do | ||
17 | bn=`basename $f` | ||
18 | update-alternatives --install /$f $bn /$f.26 60 | ||
19 | done | ||
20 | update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60 | ||
21 | update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60 | ||
22 | } | ||
23 | |||
24 | pkg_prerm_module-init-tools() { | ||
25 | for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do | ||
26 | bn=`basename $f` | ||
27 | update-alternatives --remove $bn /$f.26 | ||
28 | done | ||
29 | update-alternatives --remove bin-lsmod /bin/lsmod.26 | ||
30 | update-alternatives --remove lsmod /bin/lsmod.26 | ||
31 | } | ||
32 | |||
33 | pkg_postinst_module-init-tools-depmod() { | ||
34 | update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60 | ||
35 | } | ||
36 | |||
37 | pkg_prerm_module-init-tools-depmod() { | ||
38 | update-alternatives --remove depmod /sbin/depmod.26 | ||
39 | } | ||
40 | |||
41 | SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5" | ||
42 | SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b" | ||
diff --git a/meta/recipes-kernel/module-init-tools/files/PD.patch b/meta/recipes-kernel/modutils-initscripts/files/PD.patch index 21ac49cbd8..21ac49cbd8 100644 --- a/meta/recipes-kernel/module-init-tools/files/PD.patch +++ b/meta/recipes-kernel/modutils-initscripts/files/PD.patch | |||
diff --git a/meta/recipes-kernel/module-init-tools/files/modutils.sh b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh index 9049bbb8aa..9049bbb8aa 100755 --- a/meta/recipes-kernel/module-init-tools/files/modutils.sh +++ b/meta/recipes-kernel/modutils-initscripts/files/modutils.sh | |||
diff --git a/meta/recipes-kernel/module-init-tools/modutils-initscripts.bb b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb index 89d38cff45..89d38cff45 100644 --- a/meta/recipes-kernel/module-init-tools/modutils-initscripts.bb +++ b/meta/recipes-kernel/modutils-initscripts/modutils-initscripts.bb | |||