The following commit has been merged in the master branch:
commit e8b335ca0aa71ad32e619b5afefc337a50ed1f96
Author: Patrick Winnertz <win...@debian.org>
Date:   Wed Apr 21 11:13:57 2010 +0200

    Updated darwin patch, as we need it to build correctly on linux
    
    Signed-off-by: Patrick Winnertz <win...@debian.org>

diff --git a/debian/patches/00list b/debian/patches/00list
index 522d376..91f2174 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -5,7 +5,7 @@ posix_acl.dpatch
 ldiskfs-detect-2.6.20-2.6.22.dpatch
 no_default_debugging.dpatch
 autogen.sh.dpatch
-#no-darwin.dpatch
+no-darwin.dpatch
 libsysio.dpatch
 bug12769-ql-fix.dpatch
 # Debian patches
diff --git a/debian/patches/no-darwin.dpatch b/debian/patches/no-darwin.dpatch
index 3652a65..8361254 100755
--- a/debian/patches/no-darwin.dpatch
+++ b/debian/patches/no-darwin.dpatch
@@ -7,68 +7,7 @@
 
 @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
---- lustre-1.8.2~/autoMakefile.am      2010-03-03 13:43:00.000000000 +0000
-+++ lustre-1.8.2/autoMakefile.am       2010-03-03 14:02:31.579839504 +0000
-@@ -4,7 +4,7 @@
- RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
- if LDISKFS_ENABLED
- if !LDISKFS_IN_KERNEL
--EXTRA_SOURCES := @SYMVERFILE@
-+#EXTRA_SOURCES := @SYMVERFILE@
- endif
- endif
- 
 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~
---- lustre-1.8.2~/autoMakefile.am.~1~  1970-01-01 00:00:00.000000000 +0000
-+++ lustre-1.8.2/autoMakefile.am.~1~   2010-03-03 13:43:00.000000000 +0000
-@@ -0,0 +1,47 @@
-+SUBDIRS := @LDISKFS_SUBDIR@ @SPL_SUBDIR@ @ZFS_SUBDIR@ . @LIBSYSIO_SUBDIR@ 
@SNMP_SUBDIR@ @LUSTREIOKIT_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-+DIST_SUBDIRS := @SNMP_DIST_SUBDIR@ libsysio ldiskfs @LUSTREIOKIT_SUBDIR@ 
@LIBCFS_SUBDIR@ lnet lustre 
-+SOURCES_SUBDIRS := @LDISKFS_SUBDIR@ @LIBCFS_SUBDIR@ lnet lustre
-+RPM_SUBDIRS := @LDISKFS_SUBDIR@ @LUSTREIOKIT_SUBDIR@
-+if LDISKFS_ENABLED
-+if !LDISKFS_IN_KERNEL
-+EXTRA_SOURCES := @SYMVERFILE@
-+endif
-+endif
-+
-+include build/autoMakefile.am.toplevel
-+
-+EXTRA_DIST += config.h.in debian/*
-+
-+if LDISKFS_ENABLED
-+if !LDISKFS_IN_KERNEL
-...@symverfile@: @LDISKFS_DIR@/@SYMVERFILE@
-+      touch @SYMVERFILE@
-+      -grep -v ldiskfs @SYMVERFILE@ > @symverf...@.old
-+      cat @symverf...@.old @LDISKFS_DIR@/@SYMVERFILE@ > @SYMVERFILE@
-+endif
-+endif
-+
-+CSTK=/tmp/checkstack
-+CSTKO=/tmp/checkstack.orig
-+
-+checkstack:
-+      [ -f ${CSTK} -a ! -s ${CSTKO} ] && mv -f ${CSTK} ${CSTKO} || true
-+      { for MOD in $$(find . -name "*.ko"); do                             \
-+              objdump -d $$MOD | perl build/checkstack.pl;                 \
-+        done } | grep -v " bug " | sort -nr | uniq > ${CSTK}
-+      [ -f ${CSTKO} ] && ! diff -u ${CSTKO} ${CSTK} || head -30 ${CSTK}
-+
-+checkstack-update:
-+      [ -f ${CSTK} ] && mv -f ${CSTK} ${CSTKO}
-+
-+checkstack-clean:
-+      rm -f ${CSTK} ${CSTKO}
-+
-+module-dist-hook:
-+      if [ -d CVS -o -d .git ]; then \
-+          perl lustre/scripts/tree_status.pl > $(distdir)/tree_status; \
-+      elif [ -f tree_status ]; then \
-+          cp tree_status $(distdir)/tree_status; \
-+      else \
-+          echo -e "I have no idea how to create a tree_status file in 
$(distdir).\nPlease file a bug at http://bugzilla.lustre.org/";; \
-+      fi
 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

-- 
Lustre Debian Packaging 

_______________________________________________
Pkg-lustre-svn-commit mailing list
Pkg-lustre-svn-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-lustre-svn-commit

Reply via email to