The following commit has been merged in the master branch:
commit 9f19dda3cf714dbf2c037e68fa68a3f8a7710987
Author: Patrick Winnertz <winnie at debian.org>
Date: Wed May 5 11:42:57 2010 +0200
Updated no-darwin patch for 1.8.3
Signed-off-by: Patrick Winnertz <winnie at debian.org>
diff --git a/debian/patches/no-darwin.dpatch b/debian/patches/no-darwin.dpatch
index 8361254..37e16d9 100755
--- a/debian/patches/no-darwin.dpatch
+++ b/debian/patches/no-darwin.dpatch
@@ -6,41 +6,71 @@
## DP: Remove darwin subdirs from autoMakefile.am files
@DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre-1.8.2~/autoMakefile.am lustre-1.8.2/autoMakefile.am
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre-1.8.2~/autoMakefile.am.~1~ lustre-1.8.2/autoMakefile.am.~1~
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre-1.8.2~/lnet/include/libcfs/Makefile.am lustre-1.8.2/lnet/include/libcfs/Makefile.am
---- lustre-1.8.2~/lnet/include/libcfs/Makefile.am 2010-03-03 14:01:34.000000000 +0000
-+++ lustre-1.8.2/lnet/include/libcfs/Makefile.am 2010-03-03 14:01:38.748634013 +0000
-@@ -1,7 +1,7 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lnet/include/libcfs/Makefile.am lustre/lnet/include/libcfs/Makefile.am
+--- lustre~/lnet/include/libcfs/Makefile.am 2010-05-05 11:24:03.000000000 +0200
++++ lustre/lnet/include/libcfs/Makefile.am 2010-05-05 11:40:59.198032073 +0200
+@@ -1,8 +1,8 @@
SUBDIRS := linux
-if DARWIN
-SUBDIRS += darwin
-endif
+-DIST_SUBDIRS := linux darwin
+#if DARWIN
+#SUBDIRS += darwin
+#endif
- DIST_SUBDIRS := $(SUBDIRS)
++DIST_SUBDIRS := $(SUBDIRS)
EXTRA_DIST := curproc.h kp30.h libcfs.h list.h lltrace.h \
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre-1.8.2~/lnet/include/lnet/Makefile.am lustre-1.8.2/lnet/include/lnet/Makefile.am
---- lustre-1.8.2~/lnet/include/lnet/Makefile.am 2010-03-03 14:01:34.000000000 +0000
-+++ lustre-1.8.2/lnet/include/lnet/Makefile.am 2010-03-03 14:01:38.748634013 +0000
-@@ -1,9 +1,9 @@
+ portals_utils.h types.h user-lock.h user-prim.h user-time.h \
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lnet/include/libcfs/Makefile.am.~1~ lustre/lnet/include/libcfs/Makefile.am.~1~
+--- lustre~/lnet/include/libcfs/Makefile.am.~1~ 1970-01-01 01:00:00.000000000 +0100
++++ lustre/lnet/include/libcfs/Makefile.am.~1~ 2010-05-05 11:24:03.000000000 +0200
+@@ -0,0 +1,9 @@
++SUBDIRS := linux
++if DARWIN
++SUBDIRS += darwin
++endif
++DIST_SUBDIRS := linux darwin
++
++EXTRA_DIST := curproc.h kp30.h libcfs.h list.h lltrace.h \
++ portals_utils.h types.h user-lock.h user-prim.h user-time.h \
++ user-tcpip.h user-bitops.h bitmap.h
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lnet/include/lnet/Makefile.am lustre/lnet/include/lnet/Makefile.am
+--- lustre~/lnet/include/lnet/Makefile.am 2010-05-05 11:24:03.000000000 +0200
++++ lustre/lnet/include/lnet/Makefile.am 2010-05-05 11:39:32.333472438 +0200
+@@ -1,10 +1,10 @@
lnetdir=$(includedir)/lnet
SUBDIRS := linux
-if DARWIN
-SUBDIRS += darwin
-endif
+-DIST_SUBDIRS := linux darwin
+#if DARWIN
+#SUBDIRS += darwin
+#endif
- DIST_SUBDIRS := $(SUBDIRS)
++DIST_SUBDIRS := $(SUBDIRS)
EXTRA_DIST = api.h api-support.h \
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre-1.8.2~/lnet/klnds/socklnd/autoMakefile.am lustre-1.8.2/lnet/klnds/socklnd/autoMakefile.am
---- lustre-1.8.2~/lnet/klnds/socklnd/autoMakefile.am 2010-03-03 14:01:34.000000000 +0000
-+++ lustre-1.8.2/lnet/klnds/socklnd/autoMakefile.am 2010-03-03 14:01:38.748634013 +0000
+ lib-lnet.h lib-types.h lnet.h lnetctl.h types.h \
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lnet/include/lnet/Makefile.am.~1~ lustre/lnet/include/lnet/Makefile.am.~1~
+--- lustre~/lnet/include/lnet/Makefile.am.~1~ 1970-01-01 01:00:00.000000000 +0100
++++ lustre/lnet/include/lnet/Makefile.am.~1~ 2010-05-05 11:24:03.000000000 +0200
+@@ -0,0 +1,11 @@
++lnetdir=$(includedir)/lnet
++
++SUBDIRS := linux
++if DARWIN
++SUBDIRS += darwin
++endif
++DIST_SUBDIRS := linux darwin
++
++EXTRA_DIST = api.h api-support.h \
++ lib-lnet.h lib-types.h lnet.h lnetctl.h types.h \
++ socklnd.h ptllnd.h ptllnd_wire.h lnetst.h lnet-sysctl.h
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lnet/klnds/socklnd/autoMakefile.am lustre/lnet/klnds/socklnd/autoMakefile.am
+--- lustre~/lnet/klnds/socklnd/autoMakefile.am 2010-04-10 02:28:56.000000000 +0200
++++ lustre/lnet/klnds/socklnd/autoMakefile.am 2010-05-05 11:35:37.533473974 +0200
@@ -6,21 +6,21 @@
endif # LINUX
endif # MODULES
@@ -77,22 +107,24 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
install-data-hook: $(install_data_hook)
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre-1.8.2~/lnet/libcfs/autoMakefile.am lustre-1.8.2/lnet/libcfs/autoMakefile.am
---- lustre-1.8.2~/lnet/libcfs/autoMakefile.am 2010-03-03 14:01:34.000000000 +0000
-+++ lustre-1.8.2/lnet/libcfs/autoMakefile.am 2010-03-03 14:01:38.748634013 +0000
-@@ -35,9 +35,9 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lnet/libcfs/autoMakefile.am lustre/lnet/libcfs/autoMakefile.am
+--- lustre~/lnet/libcfs/autoMakefile.am 2010-05-05 11:24:03.000000000 +0200
++++ lustre/lnet/libcfs/autoMakefile.am 2010-05-05 11:41:39.355057967 +0200
+@@ -35,10 +35,10 @@
#
SUBDIRS := linux
-if DARWIN
-SUBDIRS += darwin
-endif
+-DIST_SUBDIRS := linux darwin
+#if DARWIN
+#SUBDIRS += darwin
+#endif
- DIST_SUBDIRS := $(SUBDIRS)
++DIST_SUBDIRS := $(SUBDIRS)
if LIBLUSTRE
+ noinst_LIBRARIES= libcfs.a
@@ -53,25 +53,25 @@
modulenet_DATA := libcfs$(KMODEXT)
endif
@@ -138,9 +170,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
endif
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre-1.8.2~/lnet/lnet/autoMakefile.am lustre-1.8.2/lnet/lnet/autoMakefile.am
---- lustre-1.8.2~/lnet/lnet/autoMakefile.am 2010-03-03 14:01:34.000000000 +0000
-+++ lustre-1.8.2/lnet/lnet/autoMakefile.am 2010-03-03 14:01:38.748634013 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lnet/lnet/autoMakefile.am lustre/lnet/lnet/autoMakefile.am
+--- lustre~/lnet/lnet/autoMakefile.am 2010-04-10 02:28:56.000000000 +0200
++++ lustre/lnet/lnet/autoMakefile.am 2010-05-05 11:35:37.533473974 +0200
@@ -18,23 +18,23 @@
modulenet_DATA = lnet$(KMODEXT)
endif # LINUX
@@ -182,9 +214,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
endif # MODULES
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre-1.8.2~/lustre/lov/autoMakefile.am lustre-1.8.2/lustre/lov/autoMakefile.am
---- lustre-1.8.2~/lustre/lov/autoMakefile.am 2010-03-03 14:01:34.000000000 +0000
-+++ lustre-1.8.2/lustre/lov/autoMakefile.am 2010-03-03 14:01:38.748634013 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/lov/autoMakefile.am lustre/lustre/lov/autoMakefile.am
+--- lustre~/lustre/lov/autoMakefile.am 2010-04-10 02:28:57.000000000 +0200
++++ lustre/lustre/lov/autoMakefile.am 2010-05-05 11:35:37.533473974 +0200
@@ -46,29 +46,29 @@
modulefs_DATA = lov$(KMODEXT)
endif
@@ -233,9 +265,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
endif # MODULES
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre-1.8.2~/lustre/lvfs/autoMakefile.am lustre-1.8.2/lustre/lvfs/autoMakefile.am
---- lustre-1.8.2~/lustre/lvfs/autoMakefile.am 2010-03-03 14:01:34.000000000 +0000
-+++ lustre-1.8.2/lustre/lvfs/autoMakefile.am 2010-03-03 14:01:38.752633824 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/lvfs/autoMakefile.am lustre/lustre/lvfs/autoMakefile.am
+--- lustre~/lustre/lvfs/autoMakefile.am 2010-04-10 02:28:57.000000000 +0200
++++ lustre/lustre/lvfs/autoMakefile.am 2010-05-05 11:35:37.533473974 +0200
@@ -85,21 +85,21 @@
endif # LINUX
@@ -273,20 +305,22 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
else # MODULES
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre-1.8.2~/lustre/obdclass/autoMakefile.am lustre-1.8.2/lustre/obdclass/autoMakefile.am
---- lustre-1.8.2~/lustre/obdclass/autoMakefile.am 2010-03-03 14:01:34.000000000 +0000
-+++ lustre-1.8.2/lustre/obdclass/autoMakefile.am 2010-03-03 14:01:38.752633824 +0000
-@@ -1,7 +1,7 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/obdclass/autoMakefile.am lustre/lustre/obdclass/autoMakefile.am
+--- lustre~/lustre/obdclass/autoMakefile.am 2010-05-05 11:24:04.000000000 +0200
++++ lustre/lustre/obdclass/autoMakefile.am 2010-05-05 11:42:14.697472299 +0200
+@@ -1,8 +1,8 @@
SUBDIRS := linux
-if DARWIN
-SUBDIRS += darwin
-endif
+-DIST_SUBDIRS := linux darwin
+#if DARWIN
+#SUBDIRS += darwin
+#endif
- DIST_SUBDIRS := $(SUBDIRS)
++DIST_SUBDIRS := $(SUBDIRS)
if LIBLUSTRE
+
@@ -25,25 +25,25 @@
noinst_DATA = llog_test$(KMODEXT)
endif # LINUX
@@ -332,9 +366,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
endif # MODULES
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre-1.8.2~/lustre/obdecho/autoMakefile.am lustre-1.8.2/lustre/obdecho/autoMakefile.am
---- lustre-1.8.2~/lustre/obdecho/autoMakefile.am 2010-03-03 14:01:34.000000000 +0000
-+++ lustre-1.8.2/lustre/obdecho/autoMakefile.am 2010-03-03 14:01:38.752633824 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/obdecho/autoMakefile.am lustre/lustre/obdecho/autoMakefile.am
+--- lustre~/lustre/obdecho/autoMakefile.am 2010-01-11 04:29:50.000000000 +0100
++++ lustre/lustre/obdecho/autoMakefile.am 2010-05-05 11:35:37.533473974 +0200
@@ -46,22 +46,22 @@
modulefs_DATA = obdecho$(KMODEXT)
endif
@@ -374,9 +408,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
endif # MODULES
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre-1.8.2~/lustre/osc/autoMakefile.am lustre-1.8.2/lustre/osc/autoMakefile.am
---- lustre-1.8.2~/lustre/osc/autoMakefile.am 2010-03-03 14:01:34.000000000 +0000
-+++ lustre-1.8.2/lustre/osc/autoMakefile.am 2010-03-03 14:01:38.752633824 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/osc/autoMakefile.am lustre/lustre/osc/autoMakefile.am
+--- lustre~/lustre/osc/autoMakefile.am 2010-04-10 02:28:57.000000000 +0200
++++ lustre/lustre/osc/autoMakefile.am 2010-05-05 11:35:37.533473974 +0200
@@ -47,22 +47,22 @@
modulefs_DATA = osc$(KMODEXT)
endif
@@ -416,9 +450,9 @@ diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch'
endif
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre-1.8.2~/lustre/ptlrpc/autoMakefile.am lustre-1.8.2/lustre/ptlrpc/autoMakefile.am
---- lustre-1.8.2~/lustre/ptlrpc/autoMakefile.am 2010-03-03 14:01:34.000000000 +0000
-+++ lustre-1.8.2/lustre/ptlrpc/autoMakefile.am 2010-03-03 14:01:38.752633824 +0000
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/ptlrpc/autoMakefile.am lustre/lustre/ptlrpc/autoMakefile.am
+--- lustre~/lustre/ptlrpc/autoMakefile.am 2010-04-10 02:28:57.000000000 +0200
++++ lustre/lustre/ptlrpc/autoMakefile.am 2010-05-05 11:35:37.533473974 +0200
@@ -68,39 +68,39 @@
modulefs_DATA = ptlrpc$(KMODEXT)
endif #LINUX
--
Lustre Debian Packaging