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>
This commit is contained in:
Khem Raj
Richard Purdie
parent
bc2c2fe1f6
commit
884c7c6eee
|
|
@ -1,25 +0,0 @@
|
|||
# disable man page build
|
||||
#
|
||||
# by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
|
||||
|
||||
Upstream-Status: Inappropriate [disable feature]
|
||||
|
||||
diff --git a/Makefile.am b/Makefile.am
|
||||
index 6f83c12..32972a8 100644
|
||||
--- a/Makefile.am
|
||||
+++ b/Makefile.am
|
||||
@@ -39,13 +39,12 @@ modindex_LDADD = $(LDADD) libmodtools.a
|
||||
MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5 modprobe.d.5
|
||||
MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
|
||||
SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
|
||||
-dist_man_MANS = $(MAN5) $(MAN8)
|
||||
# If they haven't overridden mandir, fix it (never /man!)
|
||||
mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
|
||||
|
||||
TESTSUITE := $(shell test -e @srcdir@/tests && find @srcdir@/tests -type f ! -name '*~')
|
||||
|
||||
-EXTRA_DIST = generate-modprobe.conf FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
|
||||
+EXTRA_DIST = generate-modprobe.conf FAQ CODING stress_modules.sh install-with-care
|
||||
|
||||
sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo
|
||||
if BUILD_STATIC_UTILS
|
||||
|
|
@ -1,21 +0,0 @@
|
|||
# this patch is from Mark Hatle <mark.hatle@windriver.com>, who ran into
|
||||
# a random segfault using the latest module-init-tools (3.12) and finally
|
||||
# trace back to depmod.c:grab_module, which appears that the new malloc(...)
|
||||
# setups up things, but never clears the memory that was just allocated.
|
||||
#
|
||||
# Kevin Tian <kevin.tian@intel.com>, 2010-08-06
|
||||
|
||||
Upstream-Status: Pending
|
||||
|
||||
diff --git a/depmod.c b/depmod.c
|
||||
index 647e5e6..46e03e0 100644
|
||||
--- a/depmod.c
|
||||
+++ b/depmod.c
|
||||
@@ -313,6 +313,7 @@ static struct module *grab_module(const char *dirname, const char *filename)
|
||||
|
||||
new = NOFAIL(malloc(sizeof(*new)
|
||||
+ strlen(dirname?:"") + 1 + strlen(filename) + 1));
|
||||
+ memset(new, 0x00, sizeof(*new) + strlen(dirname?:"") + 1 + strlen(filename) + 1);
|
||||
if (dirname)
|
||||
sprintf(new->pathname, "%s/%s", dirname, filename);
|
||||
else
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
# poky uses new name to differentiate from modutils, so reflect this new name in source
|
||||
#
|
||||
# comment added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
|
||||
|
||||
Upstream-Status: Inappropriate [embedded specific]
|
||||
|
||||
--- module-init-tools-3.0-pre10.orig/generate-modprobe.conf
|
||||
+++ module-init-tools-3.0-pre10/generate-modprobe.conf
|
||||
@@ -45,12 +45,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 || modprobe_abort
|
||||
-elif modprobe.old -c >/dev/null 2>&1; then
|
||||
+ /sbin/modprobe.24 -c > $MODPROBECONF || modprobe_abort
|
||||
+elif modprobe.24 -c >/dev/null 2>&1; then
|
||||
# Somewhere in path.
|
||||
- modprobe.old -c > $MODPROBECONF || modprobe_abort
|
||||
+ modprobe.24 -c > $MODPROBECONF || modprobe_abort
|
||||
elif /sbin/modprobe -V 2>/dev/null | grep -q 'modprobe version'; then
|
||||
# Running /sbin/modprobe gives old version.
|
||||
/sbin/modprobe -c > $MODPROBECONF || modprobe_abort
|
||||
|
|
@ -1,10 +0,0 @@
|
|||
require module-init-tools.inc
|
||||
PR = "r0"
|
||||
inherit cross
|
||||
PROVIDES += "virtual/${TARGET_PREFIX}depmod"
|
||||
RDEPENDS_${PN} = ""
|
||||
|
||||
SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5"
|
||||
SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b"
|
||||
|
||||
EXTRA_OECONF_append = " --program-prefix=${TARGET_PREFIX} --disable-static-utils"
|
||||
|
|
@ -1,24 +0,0 @@
|
|||
SUMMARY = "Kernel Module Utilities"
|
||||
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"
|
||||
LICENSE = "GPLv2+"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \
|
||||
file://lsmod.c;md5=743c873ec42632d2ce37d3c440f366dd"
|
||||
SECTION = "base"
|
||||
|
||||
PACKAGES =+ "module-init-tools-insmod-static module-init-tools-depmod"
|
||||
RDEPENDS_${PN} += "module-init-tools-depmod"
|
||||
|
||||
FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
|
||||
FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
|
||||
|
||||
SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
|
||||
file://modutils_extension.patch \
|
||||
file://disable_man.patch \
|
||||
file://grab_module_memset.patch"
|
||||
|
||||
inherit autotools
|
||||
|
||||
# module-init-tools uses AX_ENABLE_BUILDDIR to move rest of configuration steps
|
||||
# into a subdir. However this macro is not quite cross friendly. Instead of
|
||||
# mangling that macro, a easier way is to take the disable option
|
||||
EXTRA_OECONF = "--disable-builddir"
|
||||
|
|
@ -1,42 +0,0 @@
|
|||
require module-init-tools.inc
|
||||
PR = "r0"
|
||||
|
||||
# autotools set prefix to /usr, however we want them in /bin and /sbin
|
||||
bindir = "/bin"
|
||||
sbindir = "/sbin"
|
||||
|
||||
do_install() {
|
||||
autotools_do_install
|
||||
for f in bin/lsmod sbin/insmod sbin/rmmod sbin/modprobe sbin/modinfo sbin/depmod; do
|
||||
mv ${D}/$f ${D}/$f.26
|
||||
done
|
||||
}
|
||||
|
||||
pkg_postinst_module-init-tools() {
|
||||
for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
|
||||
bn=`basename $f`
|
||||
update-alternatives --install /$f $bn /$f.26 60
|
||||
done
|
||||
update-alternatives --install /bin/lsmod bin-lsmod /bin/lsmod.26 60
|
||||
update-alternatives --install /sbin/lsmod lsmod /bin/lsmod.26 60
|
||||
}
|
||||
|
||||
pkg_prerm_module-init-tools() {
|
||||
for f in sbin/insmod sbin/modprobe sbin/rmmod sbin/modinfo; do
|
||||
bn=`basename $f`
|
||||
update-alternatives --remove $bn /$f.26
|
||||
done
|
||||
update-alternatives --remove bin-lsmod /bin/lsmod.26
|
||||
update-alternatives --remove lsmod /bin/lsmod.26
|
||||
}
|
||||
|
||||
pkg_postinst_module-init-tools-depmod() {
|
||||
update-alternatives --install /sbin/depmod depmod /sbin/depmod.26 60
|
||||
}
|
||||
|
||||
pkg_prerm_module-init-tools-depmod() {
|
||||
update-alternatives --remove depmod /sbin/depmod.26
|
||||
}
|
||||
|
||||
SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5"
|
||||
SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b"
|
||||
Loading…
Reference in New Issue