diff options
Diffstat (limited to 'openembedded/packages/module-init-tools/module-init-tools-3.2.1')
| -rw-r--r-- | openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory | 24 | ||||
| -rw-r--r-- | openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt | 41 |
2 files changed, 0 insertions, 65 deletions
diff --git a/openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory b/openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory deleted file mode 100644 index 185ea7a3a5..0000000000 --- a/openembedded/packages/module-init-tools/module-init-tools-3.2.1/ignore_arch_directory +++ /dev/null | |||
| @@ -1,24 +0,0 @@ | |||
| 1 | diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8 | ||
| 2 | --- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200 | ||
| 3 | +++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200 | ||
| 4 | @@ -31,6 +31,7 @@ | ||
| 5 | \fI/etc/modprobe.conf\fR configuration file and | ||
| 6 | \fI/etc/modprobe.d\fR directory | ||
| 7 | (see \fBmodprobe.conf\fR(5)). | ||
| 8 | +All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored. | ||
| 9 | .PP | ||
| 10 | Note that this version of \fBmodprobe\fR does not | ||
| 11 | do anything to the module itself: the work of resolving symbols | ||
| 12 | --- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200 | ||
| 13 | +++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200 | ||
| 14 | @@ -1158,6 +1158,10 @@ | ||
| 15 | DIR *dir; | ||
| 16 | int ret = 0; | ||
| 17 | |||
| 18 | + /* ignore everything in this directory */ | ||
| 19 | + if (streq(filename, "/etc/modprobe.d/arch")) | ||
| 20 | + return 1; | ||
| 21 | + | ||
| 22 | /* Reiser4 has file/directory duality: treat it as both. */ | ||
| 23 | dir = opendir(filename); | ||
| 24 | if (dir) { | ||
diff --git a/openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt b/openembedded/packages/module-init-tools/module-init-tools-3.2.1/manpagesopt deleted file mode 100644 index 5d5cac609e..0000000000 --- a/openembedded/packages/module-init-tools/module-init-tools-3.2.1/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 | ||
