summaryrefslogtreecommitdiffstats
path: root/openembedded/packages/module-init-tools/files
diff options
context:
space:
mode:
Diffstat (limited to 'openembedded/packages/module-init-tools/files')
-rw-r--r--openembedded/packages/module-init-tools/files/ignore_arch_directory21
-rw-r--r--openembedded/packages/module-init-tools/files/manpagesopt22
2 files changed, 22 insertions, 21 deletions
diff --git a/openembedded/packages/module-init-tools/files/ignore_arch_directory b/openembedded/packages/module-init-tools/files/ignore_arch_directory
index 2c71043221..185ea7a3a5 100644
--- a/openembedded/packages/module-init-tools/files/ignore_arch_directory
+++ b/openembedded/packages/module-init-tools/files/ignore_arch_directory
@@ -1,25 +1,24 @@
1diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8 1diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8
2--- module-init-tools-3.1-pre6.orig/modprobe.8 2004-10-06 02:44:43.000000000 +0200 2--- module-init-tools-3.2-pre7/modprobe.8.orig 2005-07-05 13:52:32.000000000 +0200
3+++ module-init-tools-3.1-pre6/modprobe.8 2004-10-09 01:39:01.000000000 +0200 3+++ module-init-tools-3.2-pre7/modprobe.8 2005-07-05 13:52:42.000000000 +0200
4@@ -30,6 +30,7 @@ 4@@ -31,6 +31,7 @@
5 the modules and other files, except for the optional 5 \fI/etc/modprobe.conf\fR configuration file and
6 \fI/etc/modprobe.conf\fR configuration file 6 \fI/etc/modprobe.d\fR directory
7 (see \fBmodprobe.conf\fR(5)). 7 (see \fBmodprobe.conf\fR(5)).
8+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored. 8+All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
9 .PP 9 .PP
10 Note that this version of \fBmodprobe\fR does not 10 Note that this version of \fBmodprobe\fR does not
11 do anything to the module itself: the work of resolving symbols 11 do anything to the module itself: the work of resolving symbols
12diff -ruN module-init-tools-3.1-pre6.orig/modprobe.c module-init-tools-3.1-pre6/modprobe.c 12--- module-init-tools-3.2-pre7/modprobe.c.orig 2005-07-05 13:50:00.000000000 +0200
13--- module-init-tools-3.1-pre6.orig/modprobe.c 2004-10-09 01:40:18.000000000 +0200 13+++ module-init-tools-3.2-pre7/modprobe.c 2005-07-05 13:50:15.000000000 +0200
14+++ module-init-tools-3.1-pre6/modprobe.c 2004-10-09 01:40:11.000000000 +0200 14@@ -1158,6 +1158,10 @@
15@@ -1082,6 +1082,10 @@
16 {
17 DIR *dir; 15 DIR *dir;
16 int ret = 0;
18 17
19+ /* ignore everything in this directory */ 18+ /* ignore everything in this directory */
20+ if (streq(filename, "/etc/modprobe.d/arch")) 19+ if (streq(filename, "/etc/modprobe.d/arch"))
21+ return 1; 20+ return 1;
22+ 21+
23 /* If it's a directory, recurse. */ 22 /* Reiser4 has file/directory duality: treat it as both. */
24 dir = opendir(filename); 23 dir = opendir(filename);
25 if (dir) { 24 if (dir) {
diff --git a/openembedded/packages/module-init-tools/files/manpagesopt b/openembedded/packages/module-init-tools/files/manpagesopt
index 2e9d228d58..5d5cac609e 100644
--- a/openembedded/packages/module-init-tools/files/manpagesopt
+++ b/openembedded/packages/module-init-tools/files/manpagesopt
@@ -1,7 +1,7 @@
1Index: module-init-tools-3.1/configure.in 1Index: module-init-tools-3.2-pre9/configure.in
2=================================================================== 2===================================================================
3--- module-init-tools-3.1.orig/configure.in 2004-11-12 00:05:25.000000000 -0500 3--- module-init-tools-3.2-pre9.orig/configure.in 2005-08-09 04:31:26.000000000 +0000
4+++ module-init-tools-3.1/configure.in 2005-01-20 02:23:16.409792288 -0500 4+++ module-init-tools-3.2-pre9/configure.in 2005-09-20 22:06:10.000000000 +0000
5@@ -41,5 +41,14 @@ 5@@ -41,5 +41,14 @@
6 fi]) 6 fi])
7 AC_SUBST(MODULE_DIR) 7 AC_SUBST(MODULE_DIR)
@@ -18,22 +18,24 @@ Index: module-init-tools-3.1/configure.in
18+AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes") 18+AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes")
19 19
20+AC_OUTPUT([Makefile]) 20+AC_OUTPUT([Makefile])
21Index: module-init-tools-3.1/Makefile.am 21Index: module-init-tools-3.2-pre9/Makefile.am
22=================================================================== 22===================================================================
23--- module-init-tools-3.1.orig/Makefile.am 2004-07-12 02:11:46.000000000 -0400 23--- module-init-tools-3.2-pre9.orig/Makefile.am 2005-08-09 04:54:28.000000000 +0000
24+++ module-init-tools-3.1/Makefile.am 2005-01-20 02:24:32.155277224 -0500 24+++ module-init-tools-3.2-pre9/Makefile.am 2005-09-20 22:09:03.000000000 +0000
25@@ -21,11 +21,12 @@ 25@@ -21,13 +21,14 @@
26 MAN5 = modprobe.conf.5 modules.dep.5 26 MAN5 = modprobe.conf.5 modules.dep.5
27 MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8 27 MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
28 SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml)) 28 SGML = $(addprefix doc/, $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
29-man_MANS = $(MAN5) $(MAN8) 29-man_MANS = $(MAN5) $(MAN8)
30 mandir = $(shell if [ `echo $(prefix)/ | tr -s /` = / ]; then echo /usr/share/man; else echo $(prefix)/man; fi) 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)
31 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)
32+if MANPAGES 36+if MANPAGES
33+man_MANS = $(MAN5) $(MAN8) 37+man_MANS = $(MAN5) $(MAN8)
34+endif 38+endif
35 39
36-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ stress_modules.sh install-with-care $(SGML) $(man_MANS)
37
38 sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static 40 sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static
39 bin_PROGRAMS = lsmod 41 bin_PROGRAMS = lsmod
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-15 07:07:38 +0000