diff options
| author | Kevin Tian <kevin.tian@intel.com> | 2010-07-21 13:21:49 +0800 |
|---|---|---|
| committer | Richard Purdie <rpurdie@linux.intel.com> | 2010-07-21 21:44:37 +0100 |
| commit | b376a803cac9c6403ce7ddf2a4a479292ec9ba85 (patch) | |
| tree | b642f0fbe43e030348858dde2c564b970d88d2d1 /meta/packages/module-init-tools/files/ignore_arch_directory.patch | |
| parent | 8a251accbfd68078fbab23a96411b76928cf1063 (diff) | |
| download | openembedded-core-b376a803cac9c6403ce7ddf2a4a479292ec9ba85.tar.gz openembedded-core-b376a803cac9c6403ce7ddf2a4a479292ec9ba85.tar.bz2 openembedded-core-b376a803cac9c6403ce7ddf2a4a479292ec9ba85.tar.xz openembedded-core-b376a803cac9c6403ce7ddf2a4a479292ec9ba85.zip | |
module-init-tools: upgrade to 3.12
[Patches]
KEEP _ignore_arch_directory_: ignore /etc/modprobe.d/arch, not sure reason now.
keep it and to be verified later
REMOVE _module-init-tools-remove-index.patch_: in upstream
NEW _disable_man.patch_: a simpler patch to replace below removed two
REMOVE _manpagesopt_: due to above new patch
REMOVE _no_man_rebuild_: ditto
KEEP _modutils_extension_: poky has its own name convention and thus need such knowledge
in code
[Recipe]
- adjust indention
- remove some old lines like ${S} and EXTRA_OECONF
Signed-off-by: Kevin Tian <kevin.tian@intel.com>
Diffstat (limited to 'meta/packages/module-init-tools/files/ignore_arch_directory.patch')
| -rw-r--r-- | meta/packages/module-init-tools/files/ignore_arch_directory.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/meta/packages/module-init-tools/files/ignore_arch_directory.patch b/meta/packages/module-init-tools/files/ignore_arch_directory.patch new file mode 100644 index 000000000..7b3082480 --- /dev/null +++ b/meta/packages/module-init-tools/files/ignore_arch_directory.patch @@ -0,0 +1,28 @@ +# not sure the reason yet. Keep for a while and verify later. +# +# comments added by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 + +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 { |