From 5fb35ca11147ed30c619cf93e19331fd835f3da9 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard@openedhand.com>
Date: Fri, 10 Feb 2006 14:33:55 +0000
Subject: Apply more chanegs from OE

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@272 311d38ba-8fff-0310-9ca6-ca027cbcb966
---
 .../module-init-tools/files/ignore_arch_directory  | 21 ++++++++++-----------
 .../packages/module-init-tools/files/manpagesopt   | 22 ++++++++++++----------
 2 files changed, 22 insertions(+), 21 deletions(-)

(limited to 'openembedded/packages/module-init-tools/files')

diff --git a/openembedded/packages/module-init-tools/files/ignore_arch_directory b/openembedded/packages/module-init-tools/files/ignore_arch_directory
index 2c7104322..185ea7a3a 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 @@
 diff -ruN module-init-tools-3.1-pre6.orig/modprobe.8 module-init-tools-3.1-pre6/modprobe.8
---- module-init-tools-3.1-pre6.orig/modprobe.8	2004-10-06 02:44:43.000000000 +0200
-+++ module-init-tools-3.1-pre6/modprobe.8	2004-10-09 01:39:01.000000000 +0200
-@@ -30,6 +30,7 @@
- the modules and other files, except for the optional
- \fI/etc/modprobe.conf\fR configuration file
+--- module-init-tools-3.2-pre7/modprobe.8.orig     2005-07-05 13:52:32.000000000 +0200
++++ module-init-tools-3.2-pre7/modprobe.8  2005-07-05 13:52:42.000000000 +0200
+@@ -31,6 +31,7 @@
+ \fI/etc/modprobe.conf\fR configuration file and
+ \fI/etc/modprobe.d\fR directory
  (see \fBmodprobe.conf\fR(5)).
 +All files in the \fI/etc/modprobe.d/arch/\fR directory are ignored.
  .PP
  Note that this version of \fBmodprobe\fR does not
  do anything to the module itself: the work of resolving symbols
-diff -ruN module-init-tools-3.1-pre6.orig/modprobe.c module-init-tools-3.1-pre6/modprobe.c
---- module-init-tools-3.1-pre6.orig/modprobe.c	2004-10-09 01:40:18.000000000 +0200
-+++ module-init-tools-3.1-pre6/modprobe.c	2004-10-09 01:40:11.000000000 +0200
-@@ -1082,6 +1082,10 @@
- {
+--- module-init-tools-3.2-pre7/modprobe.c.orig	2005-07-05 13:50:00.000000000 +0200
++++ module-init-tools-3.2-pre7/modprobe.c	2005-07-05 13:50:15.000000000 +0200
+@@ -1158,6 +1158,10 @@
  	DIR *dir;
+ 	int ret = 0;
  
 +	/* ignore everything in this directory */
 +	if (streq(filename, "/etc/modprobe.d/arch"))
 +		return 1;
 +
- 	/* If it's a directory, recurse. */
+ 	/* Reiser4 has file/directory duality: treat it as both. */
  	dir = opendir(filename);
  	if (dir) {
diff --git a/openembedded/packages/module-init-tools/files/manpagesopt b/openembedded/packages/module-init-tools/files/manpagesopt
index 2e9d228d5..5d5cac609 100644
--- a/openembedded/packages/module-init-tools/files/manpagesopt
+++ b/openembedded/packages/module-init-tools/files/manpagesopt
@@ -1,7 +1,7 @@
-Index: module-init-tools-3.1/configure.in
+Index: module-init-tools-3.2-pre9/configure.in
 ===================================================================
---- module-init-tools-3.1.orig/configure.in	2004-11-12 00:05:25.000000000 -0500
-+++ module-init-tools-3.1/configure.in	2005-01-20 02:23:16.409792288 -0500
+--- module-init-tools-3.2-pre9.orig/configure.in	2005-08-09 04:31:26.000000000 +0000
++++ module-init-tools-3.2-pre9/configure.in	2005-09-20 22:06:10.000000000 +0000
 @@ -41,5 +41,14 @@
  fi])
  AC_SUBST(MODULE_DIR)
@@ -18,22 +18,24 @@ Index: module-init-tools-3.1/configure.in
 +AM_CONDITIONAL([MANPAGES], test x"$enable_manpages" = x"yes")
  
 +AC_OUTPUT([Makefile])
-Index: module-init-tools-3.1/Makefile.am
+Index: module-init-tools-3.2-pre9/Makefile.am
 ===================================================================
---- module-init-tools-3.1.orig/Makefile.am	2004-07-12 02:11:46.000000000 -0400
-+++ module-init-tools-3.1/Makefile.am	2005-01-20 02:24:32.155277224 -0500
-@@ -21,11 +21,12 @@
+--- module-init-tools-3.2-pre9.orig/Makefile.am	2005-08-09 04:54:28.000000000 +0000
++++ module-init-tools-3.2-pre9/Makefile.am	2005-09-20 22:09:03.000000000 +0000
+@@ -21,13 +21,14 @@
  MAN5 = modprobe.conf.5 modules.dep.5
  MAN8 = depmod.8 insmod.8 lsmod.8 rmmod.8 modprobe.8 modinfo.8
  SGML = $(addprefix doc/,  $(MAN5:%.5=%.sgml) $(MAN8:%.8=%.sgml))
 -man_MANS = $(MAN5) $(MAN8)
- mandir = $(shell if [ `echo $(prefix)/ | tr -s /` = / ]; then echo /usr/share/man; else echo $(prefix)/man; fi)
+ # If they haven't overridden mandir, fix it (never /man!)
+ mandir =$(shell if [ @mandir@ = $(prefix)/man ]; then if [ $(prefix) = / ]; then echo /usr/share/man; else echo $(prefix)/share/man; fi; else echo @mandir@; fi)
  
+ TESTSUITE := $(shell find tests -type f ! -name '*~') tests/vg-suppressions
+ 
+-EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ CODING stress_modules.sh install-with-care $(SGML) $(man_MANS) $(TESTSUITE)
 +if MANPAGES
 +man_MANS = $(MAN5) $(MAN8)
 +endif
  
--EXTRA_DIST = generate-modprobe.conf modprobe.devfs FAQ stress_modules.sh install-with-care $(SGML) $(man_MANS)
- 
  sbin_PROGRAMS = insmod modprobe rmmod depmod modinfo insmod.static
  bin_PROGRAMS = lsmod
-- 
cgit v1.2.3