diff options
author | Anders Darander <anders@chargestorm.se> | 2011-07-01 15:07:59 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-01 23:34:17 +0100 |
commit | c878cb8ba7df1f6295c98f23ed617a311d0222eb (patch) | |
tree | e69d657b7a109e4020d8c48eea5e9d1218c7fcf9 /meta/recipes-kernel/module-init-tools/files | |
parent | 586ccf2a3f80cafe7a55e58da4f5121935d9a23f (diff) | |
download | poky-c878cb8ba7df1f6295c98f23ed617a311d0222eb.tar.gz |
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>
Diffstat (limited to 'meta/recipes-kernel/module-init-tools/files')
-rw-r--r-- | meta/recipes-kernel/module-init-tools/files/ignore_arch_directory.patch | 30 |
1 files changed, 0 insertions, 30 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 | |||
5 | Upstream-Status: Pending | ||
6 | |||
7 | diff -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 { | ||