modules-init-tools(-cross): update to 3.16

Update to get support for Linux 3.0.
Delete the ignore_arch_directory.patch (as it does not apply to 3.16).

(From OE-Core rev: 773fc8fc45224e37d442d927ed28d50680fb954c)

Signed-off-by: Anders Darander <anders@chargestorm.se>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Anders Darander 2011-07-01 15:07:59 +02:00 committed by Richard Purdie
parent 586ccf2a3f
commit c878cb8ba7
4 changed files with 5 additions and 36 deletions

View File

@ -1,30 +0,0 @@
# not sure the reason yet. Keep for a while and verify later.
#
# comments added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
Upstream-Status: Pending
diff -ruN module-init-tools-3.12.orig/modprobe.8 module-init-tools-3.12/modprobe.8
--- module-init-tools-3.12/modprobe.8.orig
+++ module-init-tools-3.12/modprobe.8
@@ -27,6 +27,7 @@
(see \fBmodprobe.conf\fR(5)). \fBmodprobe\fR will also use module
options specified on the kernel command line in the form of
<module>\&.<option>\&.
+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
.PP
Note that unlike in 2.4 series Linux kernels (which are not supported
by this tool) this version of \fBmodprobe\fR does not
--- module-init-tools-3.12/modprobe.c.orig
+++ module-init-tools-3.12/modprobe.c
@@ -1052,6 +1052,10 @@
DIR *dir;
int ret = 0;
+ /* ignore everything in this directory */
+ if (streq(filename, "/etc/modprobe.d/arch"))
+ return 1;
+
dir = opendir(filename);
if (dir) {
struct file_entry {

View File

@ -1,7 +1,7 @@
require module-init-tools.inc
PR = "r2"
PR = "r0"
inherit cross
PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6"
PROVIDES += "virtual/${TARGET_PREFIX}depmod"
SRC_URI += "file://no-static-binaries.patch"

View File

@ -12,7 +12,6 @@ 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://ignore_arch_directory.patch \
file://modutils_extension.patch \
file://disable_man.patch \
file://grab_module_memset.patch"

View File

@ -1,5 +1,5 @@
require module-init-tools.inc
PR = "r1"
PR = "r0"
# autotools set prefix to /usr, however we want them in /bin and /sbin
bindir = "/bin"
@ -38,5 +38,5 @@ pkg_prerm_module-init-tools-depmod() {
update-alternatives --remove depmod /sbin/depmod.26
}
SRC_URI[md5sum] = "8b2257ce9abef74c4a44d825d23140f3"
SRC_URI[sha256sum] = "d012ab07ea26721467a85a775f34747c1c8897e37f16bec5317d8a72ef8b4f17"
SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5"
SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b"