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/disable_man.patch | |
parent | 8a251accbfd68078fbab23a96411b76928cf1063 (diff) | |
download | poky-b376a803cac9c6403ce7ddf2a4a479292ec9ba85.tar.gz |
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/disable_man.patch')
-rw-r--r-- | meta/packages/module-init-tools/files/disable_man.patch | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/meta/packages/module-init-tools/files/disable_man.patch b/meta/packages/module-init-tools/files/disable_man.patch new file mode 100644 index 0000000000..daf58248b1 --- /dev/null +++ b/meta/packages/module-init-tools/files/disable_man.patch | |||
@@ -0,0 +1,23 @@ | |||
1 | # disable man page build | ||
2 | # | ||
3 | # by Kevin Tian <kevin.tian@intel.com>, 2010-07-21 | ||
4 | |||
5 | diff --git a/Makefile.am b/Makefile.am | ||
6 | index 6f83c12..32972a8 100644 | ||
7 | --- a/Makefile.am | ||
8 | +++ b/Makefile.am | ||
9 | @@ -39,13 +39,12 @@ modindex_LDADD = $(LDADD) libmodtools.a | ||
10 | MAN5 = modprobe.conf.5 modules.dep.5 depmod.conf.5 modprobe.d.5 | ||
11 | MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 | ||
12 | SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) | ||
13 | -dist_man_MANS = $(MAN5) $(MAN8) | ||
14 | # If they haven't overridden mandir, fix it (never /man!) | ||
15 | mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) | ||
16 | |||
17 | TESTSUITE := $(shell test -e @srcdir@/tests && find @srcdir@/tests -type f ! -name '*~') | ||
18 | |||
19 | -EXTRA_DIST = generate-modprobe.conf FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE) | ||
20 | +EXTRA_DIST = generate-modprobe.conf FAQ CODING stress_modules.sh install-with-care | ||
21 | |||
22 | sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo | ||
23 | if BUILD_STATIC_UTILS | ||