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/manpagesopt | |
| 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/manpagesopt')
| -rw-r--r-- | meta/packages/module-init-tools/files/manpagesopt | 41 |
1 files changed, 0 insertions, 41 deletions
diff --git a/meta/packages/module-init-tools/files/manpagesopt b/meta/packages/module-init-tools/files/manpagesopt deleted file mode 100644 index 5d5cac609e..0000000000 --- a/meta/packages/module-init-tools/files/manpagesopt +++ /dev/null | |||
| @@ -1,41 +0,0 @@ | |||
| 1 | Index: module-init-tools-3.2-pre9/configure.in | ||
| 2 | =================================================================== | ||
| 3 | --- module-init-tools-3.2-pre9.orig/configure.in 2005-08-09 04:31:26.000000000 +0000 | ||
| 4 | +++ module-init-tools-3.2-pre9/configure.in 2005-09-20 22:06:10.000000000 +0000 | ||
| 5 | @@ -41,5 +41,14 @@ | ||
| 6 | fi]) | ||
| 7 | AC_SUBST(MODULE_DIR) | ||
| 8 | |||
| 9 | -AC_OUTPUT([Makefile]) | ||
| 10 | +AC_ARG_ENABLE(manpages, | ||
| 11 | +[ --disable-manpages Disable man page generation.], | ||
| 12 | +[if test x"$enableval" != x"no"; then | ||
| 13 | + enable_manpages=yes | ||
| 14 | +else | ||
| 15 | + enable_manpages=no | ||
| 16 | +fi], | ||
| 17 | +[enable_manpages=yes]) | ||
| 18 | +AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes") | ||
| 19 | |||
| 20 | +AC_OUTPUT([Makefile]) | ||
| 21 | Index: module-init-tools-3.2-pre9/Makefile.am | ||
| 22 | =================================================================== | ||
| 23 | --- module-init-tools-3.2-pre9.orig/Makefile.am 2005-08-09 04:54:28.000000000 +0000 | ||
| 24 | +++ module-init-tools-3.2-pre9/Makefile.am 2005-09-20 22:09:03.000000000 +0000 | ||
| 25 | @@ -21,13 +21,14 @@ | ||
| 26 | MAN5 = modprobe.conf.5 modules.dep.5 | ||
| 27 | MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 | ||
| 28 | SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) | ||
| 29 | -man_MANS = $(MAN5) $(MAN8) | ||
| 30 | # If they haven't overridden mandir, fix it (never /man!) | ||
| 31 | mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi) | ||
| 32 | |||
| 33 | TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions | ||
| 34 | |||
| 35 | -EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE) | ||
| 36 | +if MANPAGES | ||
| 37 | +man_MANS = $(MAN5) $(MAN8) | ||
| 38 | +endif | ||
| 39 | |||
| 40 | sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static | ||
| 41 | bin_PROGRAMS = lsmod | ||
