summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch30
-rw-r--r--meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb (renamed from meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb)4
-rw-r--r--meta/recipes-kernel/module-init-tools/module-init-tools.inc1
-rw-r--r--meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb (renamed from meta/recipes-kernel/module-init-tools/module-init-tools_3.12.bb)6
4 files changed, 5 insertions, 36 deletions
diff --git a/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch b/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
deleted file mode 100644
index d29957d98b..0000000000
--- a/meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch
+++ /dev/null
@@ -1,30 +0,0 @@
1# not sure the reason yet. Keep for a while and verify later.
2#
3# comments added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21
4
5Upstream-Status: Pending
6
7diff -ruN module-init-tools-3.12.orig/modprobe.8 module-init-tools-3.12/modprobe.8
8--- module-init-tools-3.12/modprobe.8.orig
9+++ module-init-tools-3.12/modprobe.8
10@@ -27,6 +27,7 @@
11 (see \fBmodprobe.conf\fR(5)). \fBmodprobe\fR will also use module
12 options specified on the kernel command line in the form of
13 <module>\&.<option>\&.
14+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
15 .PP
16 Note that unlike in 2.4 series Linux kernels (which are not supported
17 by this tool) this version of \fBmodprobe\fR does not
18--- module-init-tools-3.12/modprobe.c.orig
19+++ module-init-tools-3.12/modprobe.c
20@@ -1052,6 +1052,10 @@
21 DIR *dir;
22 int ret = 0;
23
24+ /* ignore everything in this directory */
25+ if (streq(filename, "/etc/modprobe.d/arch"))
26+ return 1;
27+
28 dir = opendir(filename);
29 if (dir) {
30 struct file_entry {
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
index 5cbf9c50e7..8b3458bf53 100644
--- a/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.12.bb
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools-cross_3.16.bb
@@ -1,7 +1,7 @@
1require module-init-tools.inc 1require module-init-tools.inc
2PR = "r2" 2PR = "r0"
3inherit cross 3inherit cross
4PROVIDES += "virtual/${TARGET_PREFIX}depmod virtual/${TARGET_PREFIX}depmod-2.6" 4PROVIDES += "virtual/${TARGET_PREFIX}depmod"
5 5
6SRC_URI += "file://no-static-binaries.patch" 6SRC_URI += "file://no-static-binaries.patch"
7 7
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools.inc b/meta/recipes-kernel/module-init-tools/module-init-tools.inc
index 4d96d16f60..c290c4f7fb 100644
--- a/meta/recipes-kernel/module-init-tools/module-init-tools.inc
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools.inc
@@ -12,7 +12,6 @@ FILES_module-init-tools-depmod = "${sbindir}/depmod.26"
12FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static" 12FILES_module-init-tools-insmod-static = "${sbindir}/insmod.static"
13 13
14SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \ 14SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/module-init-tools/module-init-tools-${PV}.tar.bz2 \
15 file://ignore_arch_directory.patch \
16 file://modutils_extension.patch \ 15 file://modutils_extension.patch \
17 file://disable_man.patch \ 16 file://disable_man.patch \
18 file://grab_module_memset.patch" 17 file://grab_module_memset.patch"
diff --git a/meta/recipes-kernel/module-init-tools/module-init-tools_3.12.bb b/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb
index 3d7c287092..0248b464c1 100644
--- a/meta/recipes-kernel/module-init-tools/module-init-tools_3.12.bb
+++ b/meta/recipes-kernel/module-init-tools/module-init-tools_3.16.bb
@@ -1,5 +1,5 @@
1require module-init-tools.inc 1require module-init-tools.inc
2PR = "r1" 2PR = "r0"
3 3
4# autotools set prefix to /usr, however we want them in /bin and /sbin 4# autotools set prefix to /usr, however we want them in /bin and /sbin
5bindir = "/bin" 5bindir = "/bin"
@@ -38,5 +38,5 @@ pkg_prerm_module-init-tools-depmod() {
38 update-alternatives --remove depmod /sbin/depmod.26 38 update-alternatives --remove depmod /sbin/depmod.26
39} 39}
40 40
41SRC_URI[md5sum] = "8b2257ce9abef74c4a44d825d23140f3" 41SRC_URI[md5sum] = "bc44832c6e41707b8447e2847d2019f5"
42SRC_URI[sha256sum] = "d012ab07ea26721467a85a775f34747c1c8897e37f16bec5317d8a72ef8b4f17" 42SRC_URI[sha256sum] = "e1f2cdcae64a8effc25e545a5e0bdaf312f816ebbcd0916e4e87450755fab64b"