[Pkg-lustre-svn-commit] updated: [fff132c] Move to 3.0 (quilt) Signed-off-by: Patrick Winnertz <winnie at debian.org>
Patrick Winnertz
winnie at debian.org
Fri Dec 10 10:44:26 UTC 2010
The following commit has been merged in the master branch:
commit fff132c08c7cdf5778e44e051ee439b5580ec242
Author: Patrick Winnertz <winnie at debian.org>
Date: Tue Dec 7 14:01:52 2010 +0100
Move to 3.0 (quilt)
Signed-off-by: Patrick Winnertz <winnie at debian.org>
diff --git a/debian/patches/00list b/debian/patches/00list
deleted file mode 100644
index cf9145e..0000000
--- a/debian/patches/00list
+++ /dev/null
@@ -1,29 +0,0 @@
-# patches
-page-size-undef-fixes.dpatch
-#inode-no-i_blksize-2.6.20.dpatch
-posix_acl.dpatch
-ldiskfs-detect-2.6.20-2.6.22.dpatch
-no_default_debugging.dpatch
-autogen.sh.dpatch
-no-darwin.dpatch
-libsysio.dpatch
-bug12769-ql-fix.dpatch
-bug15587_security.capability_xattr.dpatch
-# Debian patches
-bash_completion.dpatch
-lustre_manpage.dpatch
-tex2pdf.dpatch
-lustre_config.dpatch
-fix-2.6.15-versioncheck.dpatch
-bug13852-quota_includes.dpatch
-#fix-lustre-manpage.dpatch
-enable-quota.dpatch
-fix-symlink-attack.dpatch
-use_bash_instead_of_sh.dpatch
-fix_version_tag-pl.dpatch
-#hotfixes for 1.8.2:
-fix-oot-builds.dpatch
-#fix_various_typecasts.dpatch
-no-strict-aliasing.dpatch
-fix_bashisms_for_dash.dpatch
-fix_dentry_conf_test.dpatch
diff --git a/debian/patches/LBUG_open-unlinked_bug_22177-1.dpatch b/debian/patches/LBUG_open-unlinked_bug_22177-1.dpatch
deleted file mode 100755
index b5588b9..0000000
--- a/debian/patches/LBUG_open-unlinked_bug_22177-1.dpatch
+++ /dev/null
@@ -1,132 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## LBUG_open-unlinked_bug_22177-1.dpatch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch from bugzilla #22177
-
- at DPATCH@
-diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
-index 97dc613..3c53148 100644
---- a/lustre/mds/mds_reint.c
-+++ b/lustre/mds/mds_reint.c
-@@ -1755,31 +1755,37 @@ static int mds_orphan_add_link(struct mds_update_record *rec,
- * for linking and return real mode back then -bzzz */
- mode = inode->i_mode;
- inode->i_mode = S_IFREG;
-- /* avoid vfs_link upon 0 nlink inode */
-- ++inode->i_nlink;
-+ /* avoid vfs_link upon 0 nlink inode, inc by 2 instead of 1 because
-+ * ext3_inc_count() can reset i_nlink for indexed directory */
-+ inode->i_nlink += 2;
- rc = ll_vfs_link(dentry, mds->mds_vfsmnt, pending_dir, pending_child,
- mds->mds_vfsmnt);
- if (rc)
-- CERROR("error linking orphan %s to PENDING: rc = %d\n",
-+ CERROR("error linking orphan %s %s to PENDING: rc = %d\n",
-+ S_ISDIR(mode) ? "dir" : S_ISREG(mode) ? "file" : "other",
- rec->ur_name, rc);
- else
- mds_inode_set_orphan(inode);
-
- /* return mode and correct i_nlink if inode is directory */
- inode->i_mode = mode;
-- LASSERTF(inode->i_nlink == 2, "%s nlink == %d\n",
-+ LASSERTF(rc || inode->i_nlink == 3, "%s nlink == %d\n",
- S_ISDIR(mode) ? "dir" : S_ISREG(mode) ? "file" : "other",
- inode->i_nlink);
-+
- if (S_ISDIR(mode)) {
- pending_dir->i_nlink++;
- if (pending_dir->i_sb->s_op->dirty_inode)
- pending_dir->i_sb->s_op->dirty_inode(pending_dir);
-- } else {
-- --inode->i_nlink;
-- if (inode->i_sb->s_op->dirty_inode)
-- inode->i_sb->s_op->dirty_inode(inode);
- }
-
-+ inode->i_nlink -= 2;
-+ if (inode->i_sb->s_op->dirty_inode)
-+ inode->i_sb->s_op->dirty_inode(inode);
-+
-+ if (rc)
-+ GOTO(out_dput, rc);
-+
- GOTO(out_dput, rc = 1);
- out_dput:
- l_dput(pending_child);
-@@ -2048,11 +2054,18 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset,
- }
-
- if (rc == 0 && child_inode->i_nlink == 0) {
-- if (mds_orphan_needed(obd, child_inode))
-+ if (mds_orphan_needed(obd, child_inode)) {
- rc = mds_orphan_add_link(rec, obd, dchild);
--
-- if (rc == 1)
-- GOTO(cleanup, rc = 0);
-+ if (rc == 1)
-+ /* child inode was successfully linked
-+ * to PENDING */
-+ GOTO(cleanup, rc = 0);
-+ else
-+ /* we failed to move the file to PENDING,
-+ * really unlink the file as if there were
-+ * no more openers */
-+ rc = 0;
-+ }
-
- if (!S_ISREG(child_inode->i_mode))
- GOTO(cleanup, rc);
-@@ -2738,11 +2751,18 @@ no_unlink:
- }
-
- if (rc == 0 && new_inode != NULL && new_inode->i_nlink == 0) {
-- if (mds_orphan_needed(obd, new_inode))
-+ if (mds_orphan_needed(obd, new_inode)) {
- rc = mds_orphan_add_link(rec, obd, de_new);
-
-- if (rc == 1)
-- GOTO(cleanup, rc = 0);
-+ if (rc == 1)
-+ /* inode successfully linked to PENDING */
-+ GOTO(cleanup, rc = 0);
-+ else
-+ /* we failed to move the file to PENDING,
-+ * really unlink the file as if there were
-+ * no more openers */
-+ rc = 0;
-+ }
-
- if (!S_ISREG(new_inode->i_mode))
- GOTO(cleanup, rc);
-diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
-index 4241a6b..7cefe84 100644
---- a/lustre/tests/sanity.sh
-+++ b/lustre/tests/sanity.sh
-@@ -6458,6 +6458,25 @@ test_202() {
- }
- run_test 202 "O_APPEND+O_DIRECT multistripe write ========================"
-
-+test_203() { # bug 22177
-+ mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir"
-+ # create enough files to index the directory
-+ createmany -o $DIR/$tdir/foobar 4000
-+ # print attributes for debug purpose
-+ lsattr -d .
-+ # open dir
-+ multiop_bg_pause $DIR/$tdir D_Sc || return 1
-+ MULTIPID=$!
-+ # remove the files & current working dir
-+ unlinkmany $DIR/$tdir/foobar 4000
-+ rmdir $DIR/$tdir
-+ kill -USR1 $MULTIPID
-+ wait $MULTIPID
-+ stat $DIR/$tdir && error "open-unlinked dir was not removed!"
-+ return 0
-+}
-+run_test 203 "Test open-unlinked dir ========================"
-+
- #
- # tests that do cleanup/setup should be run at the end
- #
diff --git a/debian/patches/LBUG_open-unlinked_bug_22177-1.patch b/debian/patches/LBUG_open-unlinked_bug_22177-1.patch
new file mode 100755
index 0000000..e7ba891
--- /dev/null
+++ b/debian/patches/LBUG_open-unlinked_bug_22177-1.patch
@@ -0,0 +1,128 @@
+## LBUG_open-unlinked_bug_22177-1.dpatch by Patrick Winnertz <winnie at debian.org>
+## DP: Patch from bugzilla #22177
+
+diff --git a/lustre/mds/mds_reint.c b/lustre/mds/mds_reint.c
+index 97dc613..3c53148 100644
+--- a/lustre/mds/mds_reint.c
++++ b/lustre/mds/mds_reint.c
+@@ -1755,31 +1755,37 @@ static int mds_orphan_add_link(struct mds_update_record *rec,
+ * for linking and return real mode back then -bzzz */
+ mode = inode->i_mode;
+ inode->i_mode = S_IFREG;
+- /* avoid vfs_link upon 0 nlink inode */
+- ++inode->i_nlink;
++ /* avoid vfs_link upon 0 nlink inode, inc by 2 instead of 1 because
++ * ext3_inc_count() can reset i_nlink for indexed directory */
++ inode->i_nlink += 2;
+ rc = ll_vfs_link(dentry, mds->mds_vfsmnt, pending_dir, pending_child,
+ mds->mds_vfsmnt);
+ if (rc)
+- CERROR("error linking orphan %s to PENDING: rc = %d\n",
++ CERROR("error linking orphan %s %s to PENDING: rc = %d\n",
++ S_ISDIR(mode) ? "dir" : S_ISREG(mode) ? "file" : "other",
+ rec->ur_name, rc);
+ else
+ mds_inode_set_orphan(inode);
+
+ /* return mode and correct i_nlink if inode is directory */
+ inode->i_mode = mode;
+- LASSERTF(inode->i_nlink == 2, "%s nlink == %d\n",
++ LASSERTF(rc || inode->i_nlink == 3, "%s nlink == %d\n",
+ S_ISDIR(mode) ? "dir" : S_ISREG(mode) ? "file" : "other",
+ inode->i_nlink);
++
+ if (S_ISDIR(mode)) {
+ pending_dir->i_nlink++;
+ if (pending_dir->i_sb->s_op->dirty_inode)
+ pending_dir->i_sb->s_op->dirty_inode(pending_dir);
+- } else {
+- --inode->i_nlink;
+- if (inode->i_sb->s_op->dirty_inode)
+- inode->i_sb->s_op->dirty_inode(inode);
+ }
+
++ inode->i_nlink -= 2;
++ if (inode->i_sb->s_op->dirty_inode)
++ inode->i_sb->s_op->dirty_inode(inode);
++
++ if (rc)
++ GOTO(out_dput, rc);
++
+ GOTO(out_dput, rc = 1);
+ out_dput:
+ l_dput(pending_child);
+@@ -2048,11 +2054,18 @@ static int mds_reint_unlink(struct mds_update_record *rec, int offset,
+ }
+
+ if (rc == 0 && child_inode->i_nlink == 0) {
+- if (mds_orphan_needed(obd, child_inode))
++ if (mds_orphan_needed(obd, child_inode)) {
+ rc = mds_orphan_add_link(rec, obd, dchild);
+-
+- if (rc == 1)
+- GOTO(cleanup, rc = 0);
++ if (rc == 1)
++ /* child inode was successfully linked
++ * to PENDING */
++ GOTO(cleanup, rc = 0);
++ else
++ /* we failed to move the file to PENDING,
++ * really unlink the file as if there were
++ * no more openers */
++ rc = 0;
++ }
+
+ if (!S_ISREG(child_inode->i_mode))
+ GOTO(cleanup, rc);
+@@ -2738,11 +2751,18 @@ no_unlink:
+ }
+
+ if (rc == 0 && new_inode != NULL && new_inode->i_nlink == 0) {
+- if (mds_orphan_needed(obd, new_inode))
++ if (mds_orphan_needed(obd, new_inode)) {
+ rc = mds_orphan_add_link(rec, obd, de_new);
+
+- if (rc == 1)
+- GOTO(cleanup, rc = 0);
++ if (rc == 1)
++ /* inode successfully linked to PENDING */
++ GOTO(cleanup, rc = 0);
++ else
++ /* we failed to move the file to PENDING,
++ * really unlink the file as if there were
++ * no more openers */
++ rc = 0;
++ }
+
+ if (!S_ISREG(new_inode->i_mode))
+ GOTO(cleanup, rc);
+diff --git a/lustre/tests/sanity.sh b/lustre/tests/sanity.sh
+index 4241a6b..7cefe84 100644
+--- a/lustre/tests/sanity.sh
++++ b/lustre/tests/sanity.sh
+@@ -6458,6 +6458,25 @@ test_202() {
+ }
+ run_test 202 "O_APPEND+O_DIRECT multistripe write ========================"
+
++test_203() { # bug 22177
++ mkdir -p $DIR/$tdir || error "creating dir $DIR/$tdir"
++ # create enough files to index the directory
++ createmany -o $DIR/$tdir/foobar 4000
++ # print attributes for debug purpose
++ lsattr -d .
++ # open dir
++ multiop_bg_pause $DIR/$tdir D_Sc || return 1
++ MULTIPID=$!
++ # remove the files & current working dir
++ unlinkmany $DIR/$tdir/foobar 4000
++ rmdir $DIR/$tdir
++ kill -USR1 $MULTIPID
++ wait $MULTIPID
++ stat $DIR/$tdir && error "open-unlinked dir was not removed!"
++ return 0
++}
++run_test 203 "Test open-unlinked dir ========================"
++
+ #
+ # tests that do cleanup/setup should be run at the end
+ #
diff --git a/debian/patches/LBUG_open-unlinked_bug_22177-2.dpatch b/debian/patches/LBUG_open-unlinked_bug_22177-2.dpatch
deleted file mode 100755
index bec6f50..0000000
--- a/debian/patches/LBUG_open-unlinked_bug_22177-2.dpatch
+++ /dev/null
@@ -1,20 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## LBUG_open-unlinked_bug_22177.dpatch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch from Bugzilla #22177, should be fixed in 1.8.3
-
- at DPATCH@
-diff --git a/lustre/mds/mds_open.c b/lustre/mds/mds_open.c
-index 4feb1d8..31e1768 100644
---- a/lustre/mds/mds_open.c
-+++ b/lustre/mds/mds_open.c
-@@ -1496,7 +1496,7 @@ int mds_mfd_close(struct ptlrpc_request *req, int offset,
- CDEBUG(D_INODE, "destroying orphan object %s\n", fidname);
-
- if ((S_ISREG(inode->i_mode) && inode->i_nlink != 1) ||
-- (S_ISDIR(inode->i_mode) && inode->i_nlink != 2))
-+ (S_ISDIR(inode->i_mode) && inode->i_nlink > 2))
- CERROR("found \"orphan\" %s %s with link count %d\n",
- S_ISREG(inode->i_mode) ? "file" : "dir",
- fidname, inode->i_nlink);
diff --git a/debian/patches/LBUG_open-unlinked_bug_22177-2.patch b/debian/patches/LBUG_open-unlinked_bug_22177-2.patch
new file mode 100755
index 0000000..c459554
--- /dev/null
+++ b/debian/patches/LBUG_open-unlinked_bug_22177-2.patch
@@ -0,0 +1,16 @@
+## LBUG_open-unlinked_bug_22177.dpatch by Patrick Winnertz <winnie at debian.org>
+## DP: Patch from Bugzilla #22177, should be fixed in 1.8.3
+
+diff --git a/lustre/mds/mds_open.c b/lustre/mds/mds_open.c
+index 4feb1d8..31e1768 100644
+--- a/lustre/mds/mds_open.c
++++ b/lustre/mds/mds_open.c
+@@ -1496,7 +1496,7 @@ int mds_mfd_close(struct ptlrpc_request *req, int offset,
+ CDEBUG(D_INODE, "destroying orphan object %s\n", fidname);
+
+ if ((S_ISREG(inode->i_mode) && inode->i_nlink != 1) ||
+- (S_ISDIR(inode->i_mode) && inode->i_nlink != 2))
++ (S_ISDIR(inode->i_mode) && inode->i_nlink > 2))
+ CERROR("found \"orphan\" %s %s with link count %d\n",
+ S_ISREG(inode->i_mode) ? "file" : "dir",
+ fidname, inode->i_nlink);
diff --git a/debian/patches/autogen.sh.dpatch b/debian/patches/autogen.sh.dpatch
deleted file mode 100755
index a5bde6f..0000000
--- a/debian/patches/autogen.sh.dpatch
+++ /dev/null
@@ -1,292 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## autogen.dpatch by Goswin von Brederlow <goswin-v-b at web.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: autogen.sh script from lustre upstream cvs for 1.6.4.2
-
- at DPATCH@
-diff -urNad lustre-1.6.4.2~/autogen.sh lustre-1.6.4.2/autogen.sh
---- lustre-1.6.4.2~/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.4.2/autogen.sh 2008-02-13 12:31:39.631640478 +0100
-@@ -0,0 +1,2 @@
-+#!/bin/sh
-+exec bash build/autogen.sh $@
-diff -urNad lustre-1.6.4.2~/build/autogen.sh lustre-1.6.4.2/build/autogen.sh
---- lustre-1.6.4.2~/build/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.4.2/build/autogen.sh 2008-02-13 12:31:39.631640478 +0100
-@@ -0,0 +1,128 @@
-+#!/bin/bash
-+
-+# taken from gnome-common/macros2/autogen.sh
-+compare_versions() {
-+ ch_min_version=$1
-+ ch_actual_version=$2
-+ ch_status=0
-+ IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="."
-+ set $ch_actual_version
-+ for ch_min in $ch_min_version; do
-+ ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
-+ if [ -z "$ch_min" ]; then break; fi
-+ if [ -z "$ch_cur" ]; then ch_status=1; break; fi
-+ if [ $ch_cur -gt $ch_min ]; then break; fi
-+ if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
-+ done
-+ IFS="$ch_save_IFS"
-+ return $ch_status
-+}
-+
-+error_msg() {
-+ echo "$cmd is $1. version $required is required to build Lustre."
-+
-+ if [ -e /usr/lib/autolustre/bin/$cmd ]; then
-+ cat >&2 <<-EOF
-+ You apparently already have Lustre-specific autoconf/make RPMs
-+ installed on your system at /usr/lib/autolustre/share/$cmd.
-+ Please set your PATH to point to those versions:
-+
-+ export PATH="/usr/lib/autolustre/bin:\$PATH"
-+ EOF
-+ else
-+ cat >&2 <<-EOF
-+ CFS provides RPMs which can be installed alongside your
-+ existing autoconf/make RPMs, if you are nervous about
-+ upgrading. See
-+
-+ ftp://ftp.lustre.org/pub/other/autolustre/README.autolustre
-+
-+ You may be able to download newer version from:
-+
-+ http://ftp.gnu.org/gnu/$tool/$tool-$required.tar.gz
-+ EOF
-+ fi
-+ [ "$cmd" = "autoconf" -a "$required" = "2.57" ] && cat >&2 <<EOF
-+
-+or for RH9 systems you can use:
-+
-+ftp://fr2.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm
-+EOF
-+ [ "$cmd" = "automake-1.7" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
-+
-+or for RH9 systems you can use:
-+
-+ftp://fr2.rpmfind.net/linux/fedora/core/1/i386/os/Fedora/RPMS/automake-1.7.8-1.noarch.rpm
-+EOF
-+ exit 1
-+}
-+
-+check_version() {
-+ local tool
-+ local cmd
-+ local required
-+ local version
-+
-+ tool=$1
-+ cmd=$2
-+ required=$3
-+ echo -n "checking for $cmd $required... "
-+ if ! $cmd --version >/dev/null ; then
-+ error_msg "missing"
-+ fi
-+ version=$($cmd --version | awk "/$tool \(GNU/ { print \$4 }")
-+ echo "found $version"
-+ if ! compare_versions "$required" "$version" ; then
-+ error_msg "too old"
-+ fi
-+}
-+
-+echo "Checking for a complete tree..."
-+if [ -d kernel_patches ] ; then
-+ # This is ldiskfs
-+ REQUIRED_DIRS="build"
-+ CONFIGURE_DIRS=""
-+else
-+ REQUIRED_DIRS="build lnet lustre"
-+ OPTIONAL_DIRS="snmp portals"
-+ CONFIGURE_DIRS="libsysio ldiskfs"
-+fi
-+
-+for dir in $REQUIRED_DIRS ; do
-+ if [ ! -d "$dir" ] ; then
-+ cat >&2 <<EOF
-+Your tree seems to be missing $dir.
-+Please read README.lustrecvs for details.
-+EOF
-+ exit 1
-+ fi
-+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
-+done
-+# optional directories for Lustre
-+for dir in $OPTIONAL_DIRS; do
-+ if [ -d "$dir" ] ; then
-+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
-+ fi
-+done
-+
-+check_version automake automake-1.7 "1.7.8"
-+check_version autoconf autoconf "2.57"
-+
-+echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
-+aclocal-1.7 $ACLOCAL_FLAGS || exit 1
-+echo "Running autoheader..."
-+autoheader || exit 1
-+echo "Running automake-1.7..."
-+automake-1.7 -a -c || exit 1
-+echo "Running autoconf..."
-+autoconf || exit 1
-+
-+# Run autogen.sh in these directories
-+for dir in $CONFIGURE_DIRS; do
-+ if [ -d $dir ] ; then
-+ pushd $dir >/dev/null
-+ echo "Running autogen for $dir..."
-+ sh autogen.sh || exit $?
-+ popd >/dev/null
-+ fi
-+done
-diff -urNad lustre-1.6.4.2~/ldiskfs/autogen.sh lustre-1.6.4.2/ldiskfs/autogen.sh
---- lustre-1.6.4.2~/ldiskfs/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.4.2/ldiskfs/autogen.sh 2008-02-13 12:31:39.631640478 +0100
-@@ -0,0 +1,2 @@
-+#!/bin/bash
-+exec bash build/autogen.sh $@
-diff -urNad lustre-1.6.4.2~/ldiskfs/build/autogen.sh lustre-1.6.4.2/ldiskfs/build/autogen.sh
---- lustre-1.6.4.2~/ldiskfs/build/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.4.2/ldiskfs/build/autogen.sh 2008-02-13 12:31:33.000000000 +0100
-@@ -0,0 +1,128 @@
-+#!/bin/bash
-+
-+# taken from gnome-common/macros2/autogen.sh
-+compare_versions() {
-+ ch_min_version=$1
-+ ch_actual_version=$2
-+ ch_status=0
-+ IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="."
-+ set $ch_actual_version
-+ for ch_min in $ch_min_version; do
-+ ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
-+ if [ -z "$ch_min" ]; then break; fi
-+ if [ -z "$ch_cur" ]; then ch_status=1; break; fi
-+ if [ $ch_cur -gt $ch_min ]; then break; fi
-+ if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
-+ done
-+ IFS="$ch_save_IFS"
-+ return $ch_status
-+}
-+
-+error_msg() {
-+ echo "$cmd is $1. version $required is required to build Lustre."
-+
-+ if [ -e /usr/lib/autolustre/bin/$cmd ]; then
-+ cat >&2 <<-EOF
-+ You apparently already have Lustre-specific autoconf/make RPMs
-+ installed on your system at /usr/lib/autolustre/share/$cmd.
-+ Please set your PATH to point to those versions:
-+
-+ export PATH="/usr/lib/autolustre/bin:\$PATH"
-+ EOF
-+ else
-+ cat >&2 <<-EOF
-+ CFS provides RPMs which can be installed alongside your
-+ existing autoconf/make RPMs, if you are nervous about
-+ upgrading. See
-+
-+ ftp://ftp.lustre.org/pub/other/autolustre/README.autolustre
-+
-+ You may be able to download newer version from:
-+
-+ http://ftp.gnu.org/gnu/$tool/$tool-$required.tar.gz
-+ EOF
-+ fi
-+ [ "$cmd" = "autoconf" -a "$required" = "2.57" ] && cat >&2 <<EOF
-+
-+or for RH9 systems you can use:
-+
-+ftp://fr2.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm
-+EOF
-+ [ "$cmd" = "automake-1.7" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
-+
-+or for RH9 systems you can use:
-+
-+ftp://fr2.rpmfind.net/linux/fedora/core/1/i386/os/Fedora/RPMS/automake-1.7.8-1.noarch.rpm
-+EOF
-+ exit 1
-+}
-+
-+check_version() {
-+ local tool
-+ local cmd
-+ local required
-+ local version
-+
-+ tool=$1
-+ cmd=$2
-+ required=$3
-+ echo -n "checking for $cmd $required... "
-+ if ! $cmd --version >/dev/null ; then
-+ error_msg "missing"
-+ fi
-+ version=$($cmd --version | awk "/$tool \(GNU/ { print \$4 }")
-+ echo "found $version"
-+ if ! compare_versions "$required" "$version" ; then
-+ error_msg "too old"
-+ fi
-+}
-+
-+echo "Checking for a complete tree..."
-+if [ -d kernel_patches ] ; then
-+ # This is ldiskfs
-+ REQUIRED_DIRS="build"
-+ CONFIGURE_DIRS=""
-+else
-+ REQUIRED_DIRS="build lnet lustre"
-+ OPTIONAL_DIRS="snmp portals"
-+ CONFIGURE_DIRS="libsysio ldiskfs"
-+fi
-+
-+for dir in $REQUIRED_DIRS ; do
-+ if [ ! -d "$dir" ] ; then
-+ cat >&2 <<EOF
-+Your tree seems to be missing $dir.
-+Please read README.lustrecvs for details.
-+EOF
-+ exit 1
-+ fi
-+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
-+done
-+# optional directories for Lustre
-+for dir in $OPTIONAL_DIRS; do
-+ if [ -d "$dir" ] ; then
-+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
-+ fi
-+done
-+
-+check_version automake automake-1.7 "1.7.8"
-+check_version autoconf autoconf "2.57"
-+
-+echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
-+aclocal-1.7 $ACLOCAL_FLAGS || exit 1
-+echo "Running autoheader..."
-+autoheader || exit 1
-+echo "Running automake-1.7..."
-+automake-1.7 -a -c || exit 1
-+echo "Running autoconf..."
-+autoconf || exit 1
-+
-+# Run autogen.sh in these directories
-+for dir in $CONFIGURE_DIRS; do
-+ if [ -d $dir ] ; then
-+ pushd $dir >/dev/null
-+ echo "Running autogen for $dir..."
-+ sh autogen.sh || exit $?
-+ popd >/dev/null
-+ fi
-+done
-diff -urNad lustre-1.6.4.2~/libsysio/autogen.sh lustre-1.6.4.2/libsysio/autogen.sh
---- lustre-1.6.4.2~/libsysio/autogen.sh 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.4.2/libsysio/autogen.sh 2008-02-13 12:31:39.631640478 +0100
-@@ -0,0 +1,5 @@
-+#!/bin/sh
-+
-+aclocal &&
-+automake --add-missing --copy &&
-+${AUTOCONF:-autoconf}
diff --git a/debian/patches/autogen.sh.patch b/debian/patches/autogen.sh.patch
new file mode 100755
index 0000000..47b1c80
--- /dev/null
+++ b/debian/patches/autogen.sh.patch
@@ -0,0 +1,286 @@
+## DP: autogen.sh script from lustre upstream cvs for 1.6.4.2
+diff -urNad lustre-1.6.4.2~/autogen.sh lustre-1.6.4.2/autogen.sh
+--- lustre-1.6.4.2~/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.4.2/autogen.sh 2008-02-13 12:31:39.631640478 +0100
+@@ -0,0 +1,2 @@
++#!/bin/sh
++exec bash build/autogen.sh $@
+diff -urNad lustre-1.6.4.2~/build/autogen.sh lustre-1.6.4.2/build/autogen.sh
+--- lustre-1.6.4.2~/build/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.4.2/build/autogen.sh 2008-02-13 12:31:39.631640478 +0100
+@@ -0,0 +1,128 @@
++#!/bin/bash
++
++# taken from gnome-common/macros2/autogen.sh
++compare_versions() {
++ ch_min_version=$1
++ ch_actual_version=$2
++ ch_status=0
++ IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="."
++ set $ch_actual_version
++ for ch_min in $ch_min_version; do
++ ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
++ if [ -z "$ch_min" ]; then break; fi
++ if [ -z "$ch_cur" ]; then ch_status=1; break; fi
++ if [ $ch_cur -gt $ch_min ]; then break; fi
++ if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
++ done
++ IFS="$ch_save_IFS"
++ return $ch_status
++}
++
++error_msg() {
++ echo "$cmd is $1. version $required is required to build Lustre."
++
++ if [ -e /usr/lib/autolustre/bin/$cmd ]; then
++ cat >&2 <<-EOF
++ You apparently already have Lustre-specific autoconf/make RPMs
++ installed on your system at /usr/lib/autolustre/share/$cmd.
++ Please set your PATH to point to those versions:
++
++ export PATH="/usr/lib/autolustre/bin:\$PATH"
++ EOF
++ else
++ cat >&2 <<-EOF
++ CFS provides RPMs which can be installed alongside your
++ existing autoconf/make RPMs, if you are nervous about
++ upgrading. See
++
++ ftp://ftp.lustre.org/pub/other/autolustre/README.autolustre
++
++ You may be able to download newer version from:
++
++ http://ftp.gnu.org/gnu/$tool/$tool-$required.tar.gz
++ EOF
++ fi
++ [ "$cmd" = "autoconf" -a "$required" = "2.57" ] && cat >&2 <<EOF
++
++or for RH9 systems you can use:
++
++ftp://fr2.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm
++EOF
++ [ "$cmd" = "automake-1.7" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
++
++or for RH9 systems you can use:
++
++ftp://fr2.rpmfind.net/linux/fedora/core/1/i386/os/Fedora/RPMS/automake-1.7.8-1.noarch.rpm
++EOF
++ exit 1
++}
++
++check_version() {
++ local tool
++ local cmd
++ local required
++ local version
++
++ tool=$1
++ cmd=$2
++ required=$3
++ echo -n "checking for $cmd $required... "
++ if ! $cmd --version >/dev/null ; then
++ error_msg "missing"
++ fi
++ version=$($cmd --version | awk "/$tool \(GNU/ { print \$4 }")
++ echo "found $version"
++ if ! compare_versions "$required" "$version" ; then
++ error_msg "too old"
++ fi
++}
++
++echo "Checking for a complete tree..."
++if [ -d kernel_patches ] ; then
++ # This is ldiskfs
++ REQUIRED_DIRS="build"
++ CONFIGURE_DIRS=""
++else
++ REQUIRED_DIRS="build lnet lustre"
++ OPTIONAL_DIRS="snmp portals"
++ CONFIGURE_DIRS="libsysio ldiskfs"
++fi
++
++for dir in $REQUIRED_DIRS ; do
++ if [ ! -d "$dir" ] ; then
++ cat >&2 <<EOF
++Your tree seems to be missing $dir.
++Please read README.lustrecvs for details.
++EOF
++ exit 1
++ fi
++ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
++done
++# optional directories for Lustre
++for dir in $OPTIONAL_DIRS; do
++ if [ -d "$dir" ] ; then
++ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
++ fi
++done
++
++check_version automake automake-1.7 "1.7.8"
++check_version autoconf autoconf "2.57"
++
++echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
++aclocal-1.7 $ACLOCAL_FLAGS || exit 1
++echo "Running autoheader..."
++autoheader || exit 1
++echo "Running automake-1.7..."
++automake-1.7 -a -c || exit 1
++echo "Running autoconf..."
++autoconf || exit 1
++
++# Run autogen.sh in these directories
++for dir in $CONFIGURE_DIRS; do
++ if [ -d $dir ] ; then
++ pushd $dir >/dev/null
++ echo "Running autogen for $dir..."
++ sh autogen.sh || exit $?
++ popd >/dev/null
++ fi
++done
+diff -urNad lustre-1.6.4.2~/ldiskfs/autogen.sh lustre-1.6.4.2/ldiskfs/autogen.sh
+--- lustre-1.6.4.2~/ldiskfs/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.4.2/ldiskfs/autogen.sh 2008-02-13 12:31:39.631640478 +0100
+@@ -0,0 +1,2 @@
++#!/bin/bash
++exec bash build/autogen.sh $@
+diff -urNad lustre-1.6.4.2~/ldiskfs/build/autogen.sh lustre-1.6.4.2/ldiskfs/build/autogen.sh
+--- lustre-1.6.4.2~/ldiskfs/build/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.4.2/ldiskfs/build/autogen.sh 2008-02-13 12:31:33.000000000 +0100
+@@ -0,0 +1,128 @@
++#!/bin/bash
++
++# taken from gnome-common/macros2/autogen.sh
++compare_versions() {
++ ch_min_version=$1
++ ch_actual_version=$2
++ ch_status=0
++ IFS="${IFS= }"; ch_save_IFS="$IFS"; IFS="."
++ set $ch_actual_version
++ for ch_min in $ch_min_version; do
++ ch_cur=`echo $1 | sed 's/[^0-9].*$//'`; shift # remove letter suffixes
++ if [ -z "$ch_min" ]; then break; fi
++ if [ -z "$ch_cur" ]; then ch_status=1; break; fi
++ if [ $ch_cur -gt $ch_min ]; then break; fi
++ if [ $ch_cur -lt $ch_min ]; then ch_status=1; break; fi
++ done
++ IFS="$ch_save_IFS"
++ return $ch_status
++}
++
++error_msg() {
++ echo "$cmd is $1. version $required is required to build Lustre."
++
++ if [ -e /usr/lib/autolustre/bin/$cmd ]; then
++ cat >&2 <<-EOF
++ You apparently already have Lustre-specific autoconf/make RPMs
++ installed on your system at /usr/lib/autolustre/share/$cmd.
++ Please set your PATH to point to those versions:
++
++ export PATH="/usr/lib/autolustre/bin:\$PATH"
++ EOF
++ else
++ cat >&2 <<-EOF
++ CFS provides RPMs which can be installed alongside your
++ existing autoconf/make RPMs, if you are nervous about
++ upgrading. See
++
++ ftp://ftp.lustre.org/pub/other/autolustre/README.autolustre
++
++ You may be able to download newer version from:
++
++ http://ftp.gnu.org/gnu/$tool/$tool-$required.tar.gz
++ EOF
++ fi
++ [ "$cmd" = "autoconf" -a "$required" = "2.57" ] && cat >&2 <<EOF
++
++or for RH9 systems you can use:
++
++ftp://fr2.rpmfind.net/linux/redhat/9/en/os/i386/RedHat/RPMS/autoconf-2.57-3.noarch.rpm
++EOF
++ [ "$cmd" = "automake-1.7" -a "$required" = "1.7.8" ] && cat >&2 <<EOF
++
++or for RH9 systems you can use:
++
++ftp://fr2.rpmfind.net/linux/fedora/core/1/i386/os/Fedora/RPMS/automake-1.7.8-1.noarch.rpm
++EOF
++ exit 1
++}
++
++check_version() {
++ local tool
++ local cmd
++ local required
++ local version
++
++ tool=$1
++ cmd=$2
++ required=$3
++ echo -n "checking for $cmd $required... "
++ if ! $cmd --version >/dev/null ; then
++ error_msg "missing"
++ fi
++ version=$($cmd --version | awk "/$tool \(GNU/ { print \$4 }")
++ echo "found $version"
++ if ! compare_versions "$required" "$version" ; then
++ error_msg "too old"
++ fi
++}
++
++echo "Checking for a complete tree..."
++if [ -d kernel_patches ] ; then
++ # This is ldiskfs
++ REQUIRED_DIRS="build"
++ CONFIGURE_DIRS=""
++else
++ REQUIRED_DIRS="build lnet lustre"
++ OPTIONAL_DIRS="snmp portals"
++ CONFIGURE_DIRS="libsysio ldiskfs"
++fi
++
++for dir in $REQUIRED_DIRS ; do
++ if [ ! -d "$dir" ] ; then
++ cat >&2 <<EOF
++Your tree seems to be missing $dir.
++Please read README.lustrecvs for details.
++EOF
++ exit 1
++ fi
++ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
++done
++# optional directories for Lustre
++for dir in $OPTIONAL_DIRS; do
++ if [ -d "$dir" ] ; then
++ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I $PWD/$dir/autoconf"
++ fi
++done
++
++check_version automake automake-1.7 "1.7.8"
++check_version autoconf autoconf "2.57"
++
++echo "Running aclocal-1.7 $ACLOCAL_FLAGS..."
++aclocal-1.7 $ACLOCAL_FLAGS || exit 1
++echo "Running autoheader..."
++autoheader || exit 1
++echo "Running automake-1.7..."
++automake-1.7 -a -c || exit 1
++echo "Running autoconf..."
++autoconf || exit 1
++
++# Run autogen.sh in these directories
++for dir in $CONFIGURE_DIRS; do
++ if [ -d $dir ] ; then
++ pushd $dir >/dev/null
++ echo "Running autogen for $dir..."
++ sh autogen.sh || exit $?
++ popd >/dev/null
++ fi
++done
+diff -urNad lustre-1.6.4.2~/libsysio/autogen.sh lustre-1.6.4.2/libsysio/autogen.sh
+--- lustre-1.6.4.2~/libsysio/autogen.sh 1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.4.2/libsysio/autogen.sh 2008-02-13 12:31:39.631640478 +0100
+@@ -0,0 +1,5 @@
++#!/bin/sh
++
++aclocal &&
++automake --add-missing --copy &&
++${AUTOCONF:-autoconf}
diff --git a/debian/patches/bash_completion.dpatch b/debian/patches/bash_completion.dpatch
deleted file mode 100755
index 76af3ba..0000000
--- a/debian/patches/bash_completion.dpatch
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bash_completion.dpatch by Alastair McKinstry <mckinstry at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Support for Bash completion. Work in progress.
-
- at DPATCH@
-diff -urNad lustre/lustre-1.6.0.1/lustre/contrib/bash_completion/lctl /tmp/dpep.59jPKV/lustre/lustre-1.6.0.1/lustre/contrib/bash_completion/lctl
---- lustre-1.6.0.1/lustre/contrib/bash_completion/lctl 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.0.1/lustre/contrib/bash_completion/lctl 2006-08-11 17:10:01.000000000 +0100
-@@ -0,0 +1,13 @@
-+#-*- mode: shell-script;-*-
-+
-+have lctl &&
-+_lctl()
-+{
-+ local cur
-+ COMPREPLY=()
-+ cur=${COMP_WORDS[COMP_CWORD]}
-+ COMPREPLY=($( compgen -W '--device --threads --ignore-errors ignore-errors dump --net network net list_nids which_nid interface_list add_interface del_interface peer_list add_peer del_peer conn_list disconnect active_tc mynid add_uuid close_uuid del_uuid add_route del_route set_route fail ping newdev device cfg_device device_list dl lustre_build_version attach setup cleanup detach lov_setup lov_modify_tgts lov_getconfig record endrecord parse dump_log clear_log conf_param probe close getattr setattr create destroy test_getattr test_setattr test_brw get_stripe set_stripe unset_stripe dump_ldlm activate deactivate recover lookup notransno readonly abort_recovery mount_option del_mount_option set_timeout set_lustre_upcall add_conn del_conn local_param llog_catlist llog_info llog_print llog_check llog_cancel llog_remove debug_daemon debug_kernel dk debug_file df clear mark filter show debug_list modules panic lwt memhog help' -- $cur ) )
-+}
-+
-+complete -F _lctl lctl
-+
-diff -urNad lustre/lustre-1.6.0.1/lustre/contrib/bash_completion/lfs /tmp/dpep.59jPKV/lustre/lustre-1.6.0.1/lustre/contrib/bash_completion/lfs
---- lustre-1.6.0.1/lustre/contrib/bash_completion/lfs 1970-01-01 01:00:00.000000000 +0100
-+++ lustre-1.6.0.1/lustre/contrib/bash_completion/lfs 2006-08-11 16:40:23.000000000 +0100
-@@ -0,0 +1,13 @@
-+#-*- mode: shell-script;-*-
-+
-+have lfs &&
-+_lfs()
-+{
-+ local cur
-+ COMPREPLY=()
-+ cur=${COMP_WORDS[COMP_CWORD]}
-+ COMPREPLY=($( compgen -W 'catinfo join osts help find getstripe setstripe quotachown quotacheck quotaon setquota quota setstripe check df' -- $cur ) )
-+}
-+
-+complete -F _lfs lfs
-+
diff --git a/debian/patches/bash_completion.patch b/debian/patches/bash_completion.patch
new file mode 100755
index 0000000..a6d3294
--- /dev/null
+++ b/debian/patches/bash_completion.patch
@@ -0,0 +1,35 @@
+## DP: Support for Bash completion. Work in progress.
+diff -urNad lustre/lustre-1.6.0.1/lustre/contrib/bash_completion/lctl /tmp/dpep.59jPKV/lustre/lustre-1.6.0.1/lustre/contrib/bash_completion/lctl
+--- lustre-1.6.0.1/lustre/contrib/bash_completion/lctl 1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.0.1/lustre/contrib/bash_completion/lctl 2006-08-11 17:10:01.000000000 +0100
+@@ -0,0 +1,13 @@
++#-*- mode: shell-script;-*-
++
++have lctl &&
++_lctl()
++{
++ local cur
++ COMPREPLY=()
++ cur=${COMP_WORDS[COMP_CWORD]}
++ COMPREPLY=($( compgen -W '--device --threads --ignore-errors ignore-errors dump --net network net list_nids which_nid interface_list add_interface del_interface peer_list add_peer del_peer conn_list disconnect active_tc mynid add_uuid close_uuid del_uuid add_route del_route set_route fail ping newdev device cfg_device device_list dl lustre_build_version attach setup cleanup detach lov_setup lov_modify_tgts lov_getconfig record endrecord parse dump_log clear_log conf_param probe close getattr setattr create destroy test_getattr test_setattr test_brw get_stripe set_stripe unset_stripe dump_ldlm activate deactivate recover lookup notransno readonly abort_recovery mount_option del_mount_option set_timeout set_lustre_upcall add_conn del_conn local_param llog_catlist llog_info llog_print llog_check llog_cancel llog_remove debug_daemon debug_kernel dk debug_file df clear mark filter show debug_list modules panic lwt memhog help' -- $cur ) )
++}
++
++complete -F _lctl lctl
++
+diff -urNad lustre/lustre-1.6.0.1/lustre/contrib/bash_completion/lfs /tmp/dpep.59jPKV/lustre/lustre-1.6.0.1/lustre/contrib/bash_completion/lfs
+--- lustre-1.6.0.1/lustre/contrib/bash_completion/lfs 1970-01-01 01:00:00.000000000 +0100
++++ lustre-1.6.0.1/lustre/contrib/bash_completion/lfs 2006-08-11 16:40:23.000000000 +0100
+@@ -0,0 +1,13 @@
++#-*- mode: shell-script;-*-
++
++have lfs &&
++_lfs()
++{
++ local cur
++ COMPREPLY=()
++ cur=${COMP_WORDS[COMP_CWORD]}
++ COMPREPLY=($( compgen -W 'catinfo join osts help find getstripe setstripe quotachown quotacheck quotaon setquota quota setstripe check df' -- $cur ) )
++}
++
++complete -F _lfs lfs
++
diff --git a/debian/patches/bug12769-ql-fix.dpatch b/debian/patches/bug12769-ql-fix.dpatch
deleted file mode 100755
index d25d2cb..0000000
--- a/debian/patches/bug12769-ql-fix.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bug12769-ql-fix.dpatch by Goswin von Brederlow <goswin-v-b at web.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Ensure that dirty pages are flushed out with the right creds
-
- at DPATCH@
-diff --git a/lustre/llite/file.c b/lustre/llite/file.c
---- a/lustre/llite/file.c
-+++ b/lustre/llite/file.c
-@@ -281,6 +281,10 @@ int ll_file_release(struct inode *inode,
- if (lsm)
- lov_test_and_clear_async_rc(lsm);
- lli->lli_async_rc = 0;
-+
-+ /* Ensure that dirty pages are flushed out with the right creds */
-+ if (file->f_mode & FMODE_WRITE)
-+ filemap_fdatawrite(file->f_mapping);
-
- rc = ll_mdc_close(sbi->ll_mdc_exp, inode, file);
- RETURN(rc);
diff --git a/debian/patches/bug12769-ql-fix.patch b/debian/patches/bug12769-ql-fix.patch
new file mode 100755
index 0000000..420b1de
--- /dev/null
+++ b/debian/patches/bug12769-ql-fix.patch
@@ -0,0 +1,17 @@
+## bug12769-ql-fix.dpatch by Goswin von Brederlow <goswin-v-b at web.de>
+## DP: Ensure that dirty pages are flushed out with the right creds
+
+diff --git a/lustre/llite/file.c b/lustre/llite/file.c
+--- a/lustre/llite/file.c
++++ b/lustre/llite/file.c
+@@ -281,6 +281,10 @@ int ll_file_release(struct inode *inode,
+ if (lsm)
+ lov_test_and_clear_async_rc(lsm);
+ lli->lli_async_rc = 0;
++
++ /* Ensure that dirty pages are flushed out with the right creds */
++ if (file->f_mode & FMODE_WRITE)
++ filemap_fdatawrite(file->f_mapping);
+
+ rc = ll_mdc_close(sbi->ll_mdc_exp, inode, file);
+ RETURN(rc);
diff --git a/debian/patches/bug13852-quota_includes.dpatch b/debian/patches/bug13852-quota_includes.dpatch
deleted file mode 100755
index 7c4f0c3..0000000
--- a/debian/patches/bug13852-quota_includes.dpatch
+++ /dev/null
@@ -1,16 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Missing include of sys/quota.h
-
- at DPATCH@
---- ./lustre/include/liblustre.h 2007-08-13 19:31:56.000000000 +0200
-+++ ./lustre/include/liblustre.h 2007-10-10 11:38:20.071254030 +0200
-@@ -50,6 +50,7 @@
- #ifndef _IOWR
- # include "ioctl.h"
- #endif
-+#include <sys/quota.h>
-
- #include <stdio.h>
- #include <sys/ioctl.h>
diff --git a/debian/patches/bug13852-quota_includes.patch b/debian/patches/bug13852-quota_includes.patch
new file mode 100755
index 0000000..5296b6f
--- /dev/null
+++ b/debian/patches/bug13852-quota_includes.patch
@@ -0,0 +1,12 @@
+## DP: Missing include of sys/quota.h
+
+--- ./lustre/include/liblustre.h 2007-08-13 19:31:56.000000000 +0200
++++ ./lustre/include/liblustre.h 2007-10-10 11:38:20.071254030 +0200
+@@ -50,6 +50,7 @@
+ #ifndef _IOWR
+ # include "ioctl.h"
+ #endif
++#include <sys/quota.h>
+
+ #include <stdio.h>
+ #include <sys/ioctl.h>
diff --git a/debian/patches/bug15587_security.capability_xattr.dpatch b/debian/patches/bug15587_security.capability_xattr.dpatch
deleted file mode 100755
index 3b1c5f7..0000000
--- a/debian/patches/bug15587_security.capability_xattr.dpatch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## bug15587_security.capability_xattr.dpatch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: ignore security.capability xattr for now
-
- at DPATCH@
-diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
-index 8fbc7bf..819e7bb 100644
---- a/lustre/llite/xattr.c
-+++ b/lustre/llite/xattr.c
-@@ -142,6 +142,11 @@ int ll_setxattr_common(struct inode *inode, const char *name,
- (xattr_type == XATTR_LUSTRE_T && strcmp(name, "lustre.lov") == 0))
- RETURN(0);
-
-+ /* b15587: ignore security.capability xattr for now */
-+ if ((xattr_type == XATTR_SECURITY_T &&
-+ strcmp(name, "security.capability") == 0))
-+ RETURN(0);
-+
- ll_inode2fid(&fid, inode);
- rc = mdc_setxattr(sbi->ll_mdc_exp, &fid, valid,
- name, value, size, 0, flags, &req);
-@@ -254,6 +259,11 @@ int ll_getxattr_common(struct inode *inode, const char *name,
- if (rc)
- RETURN(rc);
-
-+ /* b15587: ignore security.capability xattr for now */
-+ if ((xattr_type == XATTR_SECURITY_T &&
-+ strcmp(name, "security.capability") == 0))
-+ RETURN(-ENODATA);
-+
- /* posix acl is under protection of LOOKUP lock. when calling to this,
- * we just have path resolution to the target inode, so we have great
- * chance that cached ACL is uptodate.
diff --git a/debian/patches/bug15587_security.capability_xattr.patch b/debian/patches/bug15587_security.capability_xattr.patch
new file mode 100755
index 0000000..7c2a1eb
--- /dev/null
+++ b/debian/patches/bug15587_security.capability_xattr.patch
@@ -0,0 +1,31 @@
+## bug15587_security.capability_xattr.dpatch by Patrick Winnertz <winnie at debian.org>
+## DP: ignore security.capability xattr for now
+
+diff --git a/lustre/llite/xattr.c b/lustre/llite/xattr.c
+index 8fbc7bf..819e7bb 100644
+--- a/lustre/llite/xattr.c
++++ b/lustre/llite/xattr.c
+@@ -142,6 +142,11 @@ int ll_setxattr_common(struct inode *inode, const char *name,
+ (xattr_type == XATTR_LUSTRE_T && strcmp(name, "lustre.lov") == 0))
+ RETURN(0);
+
++ /* b15587: ignore security.capability xattr for now */
++ if ((xattr_type == XATTR_SECURITY_T &&
++ strcmp(name, "security.capability") == 0))
++ RETURN(0);
++
+ ll_inode2fid(&fid, inode);
+ rc = mdc_setxattr(sbi->ll_mdc_exp, &fid, valid,
+ name, value, size, 0, flags, &req);
+@@ -254,6 +259,11 @@ int ll_getxattr_common(struct inode *inode, const char *name,
+ if (rc)
+ RETURN(rc);
+
++ /* b15587: ignore security.capability xattr for now */
++ if ((xattr_type == XATTR_SECURITY_T &&
++ strcmp(name, "security.capability") == 0))
++ RETURN(-ENODATA);
++
+ /* posix acl is under protection of LOOKUP lock. when calling to this,
+ * we just have path resolution to the target inode, so we have great
+ * chance that cached ACL is uptodate.
diff --git a/debian/patches/configure_error_on_unstable.dpatch b/debian/patches/configure_error_on_unstable.dpatch
deleted file mode 100755
index 3ef87fd..0000000
--- a/debian/patches/configure_error_on_unstable.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## autogen.dpatch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix configure on debian unstable
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/build/autoconf/lustre-build-linux.m4 lustre/build/autoconf/lustre-build-linux.m4
---- lustre~/build/autoconf/lustre-build-linux.m4 2010-03-08 10:25:09.000000000 +0100
-+++ lustre/build/autoconf/lustre-build-linux.m4 2010-03-08 11:00:46.106781669 +0100
-@@ -343,7 +343,7 @@
- AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
- [$4],
- [_AC_MSG_LOG_CONFTEST
--m4_ifvaln([$5],[$5])dnl])dnl
-+m4_ifvaln([$5],[$5])dnl])
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko m4_ifval([$1], [build/conftest.c conftest.c])[]dnl
- ])
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/ldiskfs/build/autoconf/lustre-build-linux.m4 lustre/ldiskfs/build/autoconf/lustre-build-linux.m4
---- lustre~/ldiskfs/build/autoconf/lustre-build-linux.m4 2010-03-08 10:25:09.000000000 +0100
-+++ lustre/ldiskfs/build/autoconf/lustre-build-linux.m4 2010-03-08 11:01:09.629794696 +0100
-@@ -343,7 +343,7 @@
- AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
- [$4],
- [_AC_MSG_LOG_CONFTEST
--m4_ifvaln([$5],[$5])dnl])dnl
-+m4_ifvaln([$5],[$5])dnl])
- rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko m4_ifval([$1], [build/conftest.c conftest.c])[]dnl
- ])
-
diff --git a/debian/patches/configure_error_on_unstable.patch b/debian/patches/configure_error_on_unstable.patch
new file mode 100755
index 0000000..bf3c609
--- /dev/null
+++ b/debian/patches/configure_error_on_unstable.patch
@@ -0,0 +1,27 @@
+## autogen.dpatch by Patrick Winnertz <winnie at debian.org>
+## DP: fix configure on debian unstable
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/build/autoconf/lustre-build-linux.m4 lustre/build/autoconf/lustre-build-linux.m4
+--- lustre~/build/autoconf/lustre-build-linux.m4 2010-03-08 10:25:09.000000000 +0100
++++ lustre/build/autoconf/lustre-build-linux.m4 2010-03-08 11:00:46.106781669 +0100
+@@ -343,7 +343,7 @@
+ AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
+ [$4],
+ [_AC_MSG_LOG_CONFTEST
+-m4_ifvaln([$5],[$5])dnl])dnl
++m4_ifvaln([$5],[$5])dnl])
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko m4_ifval([$1], [build/conftest.c conftest.c])[]dnl
+ ])
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/ldiskfs/build/autoconf/lustre-build-linux.m4 lustre/ldiskfs/build/autoconf/lustre-build-linux.m4
+--- lustre~/ldiskfs/build/autoconf/lustre-build-linux.m4 2010-03-08 10:25:09.000000000 +0100
++++ lustre/ldiskfs/build/autoconf/lustre-build-linux.m4 2010-03-08 11:01:09.629794696 +0100
+@@ -343,7 +343,7 @@
+ AS_IF([AC_TRY_COMMAND(cp conftest.c build && make -d [$2] ${LD:+"LD=$LD"} CC="$CC" -f $PWD/build/Makefile LUSTRE_LINUX_CONFIG=$LINUX_CONFIG LINUXINCLUDE="$EXTRA_LNET_INCLUDE -I$LINUX/arch/`uname -m|sed -e 's/ppc.*/powerpc/' -e 's/x86_64/x86/' -e 's/i.86/x86/'`/include -I$LINUX/include -I$LINUX_OBJ/include -I$LINUX_OBJ/include2 -include include/linux/autoconf.h" -o tmp_include_depends -o scripts -o include/config/MARKER -C $LINUX_OBJ EXTRA_CFLAGS="-Werror-implicit-function-declaration $EXTRA_KCFLAGS" $ARCH_UM $MODULE_TARGET=$PWD/build) >/dev/null && AC_TRY_COMMAND([$3])],
+ [$4],
+ [_AC_MSG_LOG_CONFTEST
+-m4_ifvaln([$5],[$5])dnl])dnl
++m4_ifvaln([$5],[$5])dnl])
+ rm -f build/conftest.o build/conftest.mod.c build/conftest.mod.o build/conftest.ko m4_ifval([$1], [build/conftest.c conftest.c])[]dnl
+ ])
+
diff --git a/debian/patches/enable-quota.dpatch b/debian/patches/enable-quota.dpatch
deleted file mode 100755
index 9ed249a..0000000
--- a/debian/patches/enable-quota.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: --enable-quota check was only run when building modules.
-
- at DPATCH@
-diff -urNad lustre~/configure.ac lustre/configure.ac
---- lustre~/configure.ac 2009-03-12 10:32:27.000000000 +0100
-+++ lustre/configure.ac 2009-03-12 11:19:53.000000000 +0100
-@@ -8,6 +8,7 @@
- LB_CHECK_VERSION
-
- LC_CONFIG_SRCDIR
-+LC_CONFIG_QUOTA
-
- AC_CANONICAL_SYSTEM
-
-diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre-core.m4
---- lustre~/lustre/autoconf/lustre-core.m4 2009-03-12 11:19:52.000000000 +0100
-+++ lustre/lustre/autoconf/lustre-core.m4 2009-03-12 11:19:53.000000000 +0100
-@@ -1813,6 +1813,7 @@
- ])
- ])
-
-+
- #
- # LC_COOKIE_FOLLOW_LINK
- #
diff --git a/debian/patches/enable-quota.patch b/debian/patches/enable-quota.patch
new file mode 100755
index 0000000..c3be2bf
--- /dev/null
+++ b/debian/patches/enable-quota.patch
@@ -0,0 +1,24 @@
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: --enable-quota check was only run when building modules.
+diff -urNad lustre~/configure.ac lustre/configure.ac
+--- lustre~/configure.ac 2009-03-12 10:32:27.000000000 +0100
++++ lustre/configure.ac 2009-03-12 11:19:53.000000000 +0100
+@@ -8,6 +8,7 @@
+ LB_CHECK_VERSION
+
+ LC_CONFIG_SRCDIR
++LC_CONFIG_QUOTA
+
+ AC_CANONICAL_SYSTEM
+
+diff -urNad lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre-core.m4
+--- lustre~/lustre/autoconf/lustre-core.m4 2009-03-12 11:19:52.000000000 +0100
++++ lustre/lustre/autoconf/lustre-core.m4 2009-03-12 11:19:53.000000000 +0100
+@@ -1813,6 +1813,7 @@
+ ])
+ ])
+
++
+ #
+ # LC_COOKIE_FOLLOW_LINK
+ #
diff --git a/debian/patches/fix-2.6.15-versioncheck.dpatch b/debian/patches/fix-2.6.15-versioncheck.dpatch
deleted file mode 100755
index ef2cf1d..0000000
--- a/debian/patches/fix-2.6.15-versioncheck.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-2.6.15-versioncheck.dpatch by Niklas Edmundsson <Niklas.Edmundsson at hpc2n.umu.se>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix version-check for 2.6.15 ubuntu/vanilla kernel.
-## DP: Upstream check assumes RedHat patched kernel.
-
- at DPATCH@
-
-diff lustre-1.6.2/lustre/include/linux/lustre_compat25.h lustre-1.6.2/lustre/include/linux/lustre_compat25.h
---- lustre-1.6.2/lustre/include/linux/lustre_compat25.h (revision 135)
-+++ lustre-1.6.2/lustre/include/linux/lustre_compat25.h (working copy)
-@@ -75,7 +75,7 @@
- #define TRYLOCK_INODE_MUTEX(inode) (!down_trylock(&(inode)->i_sem))
- #endif /* HAVE_INODE_I_MUTEX */
-
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
-+#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
- #define d_child d_u.d_child
- #define d_rcu d_u.d_rcu
- #endif
diff --git a/debian/patches/fix-2.6.15-versioncheck.patch b/debian/patches/fix-2.6.15-versioncheck.patch
new file mode 100755
index 0000000..eb8ba70
--- /dev/null
+++ b/debian/patches/fix-2.6.15-versioncheck.patch
@@ -0,0 +1,16 @@
+## fix-2.6.15-versioncheck.dpatch by Niklas Edmundsson <Niklas.Edmundsson at hpc2n.umu.se>
+## DP: Fix version-check for 2.6.15 ubuntu/vanilla kernel.
+## DP: Upstream check assumes RedHat patched kernel.
+
+diff lustre-1.6.2/lustre/include/linux/lustre_compat25.h lustre-1.6.2/lustre/include/linux/lustre_compat25.h
+--- lustre-1.6.2/lustre/include/linux/lustre_compat25.h (revision 135)
++++ lustre-1.6.2/lustre/include/linux/lustre_compat25.h (working copy)
+@@ -75,7 +75,7 @@
+ #define TRYLOCK_INODE_MUTEX(inode) (!down_trylock(&(inode)->i_sem))
+ #endif /* HAVE_INODE_I_MUTEX */
+
+-#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,15)
++#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,15)
+ #define d_child d_u.d_child
+ #define d_rcu d_u.d_rcu
+ #endif
diff --git a/debian/patches/fix-lustre-manpage.dpatch b/debian/patches/fix-lustre-manpage.dpatch
deleted file mode 100755
index 947f9a3..0000000
--- a/debian/patches/fix-lustre-manpage.dpatch
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-lustre-manpage.dpatch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix some errors in the lustre manpage
-
- at DPATCH@
-diff -urNad lustre-1.6.5.1~/lustre/doc/lctl.8 lustre-1.6.5.1/lustre/doc/lctl.8
---- lustre-1.6.5.1~/lustre/doc/lctl.8 2007-09-27 07:09:22.000000000 +0200
-+++ lustre-1.6.5.1/lustre/doc/lctl.8 2008-09-12 16:09:43.000000000 +0200
-@@ -36,7 +36,7 @@
- command, type
- .B help
- .I command
--. Command completion is activated with the TAB key, and command history is available via the up- and down-arrow keys.
-+Command completion is activated with the TAB key, and command history is available via the up- and down-arrow keys.
-
- For non-interactive use, one uses the second invocation, which runs command after connecting to the device.
-
-diff -urNad lustre-1.6.5.1~/lustre/doc/lustre.7 lustre-1.6.5.1/lustre/doc/lustre.7
---- lustre-1.6.5.1~/lustre/doc/lustre.7 2008-09-12 16:09:32.000000000 +0200
-+++ lustre-1.6.5.1/lustre/doc/lustre.7 2008-09-12 16:09:33.000000000 +0200
-@@ -2,9 +2,9 @@
- .\" Copyright 2006 by Cluster FileSystems. All Rights Reserved.
- .\" This file may be copied under the terms of the GNU Public License.
- .\"
--.TH Lustre 7 "2006 Jun 15" Lustre "A high-performance cluster file system"
-+.TH Lustre 7
- .SH NAME
--Lustre
-+Lustre - a high-performance cluster file system
- .SH SYNOPSIS
- A high-performance file system designed for clusters.
- .SH DESCRIPTION
diff --git a/debian/patches/fix-lustre-manpage.patch b/debian/patches/fix-lustre-manpage.patch
new file mode 100755
index 0000000..fe7d491
--- /dev/null
+++ b/debian/patches/fix-lustre-manpage.patch
@@ -0,0 +1,30 @@
+## fix-lustre-manpage.dpatch by Patrick Winnertz <winnie at debian.org>
+## DP: fix some errors in the lustre manpage
+
+diff -urNad lustre-1.6.5.1~/lustre/doc/lctl.8 lustre-1.6.5.1/lustre/doc/lctl.8
+--- lustre-1.6.5.1~/lustre/doc/lctl.8 2007-09-27 07:09:22.000000000 +0200
++++ lustre-1.6.5.1/lustre/doc/lctl.8 2008-09-12 16:09:43.000000000 +0200
+@@ -36,7 +36,7 @@
+ command, type
+ .B help
+ .I command
+-. Command completion is activated with the TAB key, and command history is available via the up- and down-arrow keys.
++Command completion is activated with the TAB key, and command history is available via the up- and down-arrow keys.
+
+ For non-interactive use, one uses the second invocation, which runs command after connecting to the device.
+
+diff -urNad lustre-1.6.5.1~/lustre/doc/lustre.7 lustre-1.6.5.1/lustre/doc/lustre.7
+--- lustre-1.6.5.1~/lustre/doc/lustre.7 2008-09-12 16:09:32.000000000 +0200
++++ lustre-1.6.5.1/lustre/doc/lustre.7 2008-09-12 16:09:33.000000000 +0200
+@@ -2,9 +2,9 @@
+ .\" Copyright 2006 by Cluster FileSystems. All Rights Reserved.
+ .\" This file may be copied under the terms of the GNU Public License.
+ .\"
+-.TH Lustre 7 "2006 Jun 15" Lustre "A high-performance cluster file system"
++.TH Lustre 7
+ .SH NAME
+-Lustre
++Lustre - a high-performance cluster file system
+ .SH SYNOPSIS
+ A high-performance file system designed for clusters.
+ .SH DESCRIPTION
diff --git a/debian/patches/fix-oot-builds.dpatch b/debian/patches/fix-oot-builds.dpatch
deleted file mode 100755
index 0558b00..0000000
--- a/debian/patches/fix-oot-builds.dpatch
+++ /dev/null
@@ -1,74 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## autogen.dpatch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: forgot include dir in gcc flags and fix version_tag.pl to handle
-## DP: out of tree builds.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/build/autoconf/lustre-build.m4 lustre/build/autoconf/lustre-build.m4
---- lustre~/build/autoconf/lustre-build.m4 2010-03-03 14:44:38.000000000 +0100
-+++ lustre/build/autoconf/lustre-build.m4 2010-03-03 16:30:38.704635051 +0100
-@@ -816,7 +816,7 @@
- CC="$CC -m64"
- fi
-
--CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
-+CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$TOP_DIR/lnet/include -I$TOP_DIR/lustre/include -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
-
- LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
- AC_SUBST(LLCPPFLAGS)
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/autoMakefile.am lustre/lustre/autoMakefile.am
---- lustre~/lustre/autoMakefile.am 2010-01-23 03:07:58.000000000 +0100
-+++ lustre/lustre/autoMakefile.am 2010-03-03 16:30:38.704635051 +0100
-@@ -85,7 +85,7 @@
- BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
-
- lustre_build_version:
-- perl $(top_builddir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
-+ perl $(top_srcdir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
- echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
- cmp -s $(BUILD_VER_H) tmpver > tmpdiff 2> /dev/null && \
- $(RM) tmpver tmpdiff || \
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/scripts/version_tag.pl lustre/lustre/scripts/version_tag.pl
---- lustre~/lustre/scripts/version_tag.pl 2010-03-03 14:44:38.000000000 +0100
-+++ lustre/lustre/scripts/version_tag.pl 2010-03-03 16:33:54.136665590 +0100
-@@ -166,17 +166,19 @@
- !$ver->open("$objdir/include/linux/version.h") &&
- !$ver->open("$dir/include/linux/utsrelease.h") &&
- !$ver->open("$dir/include/linux/version.h")) {
-- die "Run make dep on '$dir'\n";
-- }
-+ #die "Run make dep on '$dir'\n";
-+ $kernver = "UNKOWN-KERNEL";
-+ } else {
-
-- while(defined($line = <$ver>)) {
-- $line =~ /\#define UTS_RELEASE "(.*)"/;
-- if ($1) {
-- $kernver = $1;
-- last;
-- }
-- }
-- $ver->close();
-+ while(defined($line = <$ver>)) {
-+ $line =~ /\#define UTS_RELEASE "(.*)"/;
-+ if ($1) {
-+ $kernver = $1;
-+ last;
-+ }
-+ }
-+ $ver->close();
-+ }
- chomp($kernver);
- $dir =~ s/\//\./g;
- return $dir;
-@@ -254,6 +256,8 @@
- if (!defined($ENV{LUSTRE_VERS}));
-
- if ($progname eq "version_tag.pl") {
-+ chdir($cwd);
-+ chdir($ARGV[1]);
- my $linuxdir = get_linuxdir();
- $linuxdir =~ s/\//\./g;
- generate_ver($tag, $mtime, $linuxdir);
diff --git a/debian/patches/fix-oot-builds.patch b/debian/patches/fix-oot-builds.patch
new file mode 100755
index 0000000..e34bec6
--- /dev/null
+++ b/debian/patches/fix-oot-builds.patch
@@ -0,0 +1,70 @@
+## autogen.dpatch by Patrick Winnertz <winnie at debian.org>
+## DP: forgot include dir in gcc flags and fix version_tag.pl to handle
+## DP: out of tree builds.
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/build/autoconf/lustre-build.m4 lustre/build/autoconf/lustre-build.m4
+--- lustre~/build/autoconf/lustre-build.m4 2010-03-03 14:44:38.000000000 +0100
++++ lustre/build/autoconf/lustre-build.m4 2010-03-03 16:30:38.704635051 +0100
+@@ -816,7 +816,7 @@
+ CC="$CC -m64"
+ fi
+
+-CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
++CPPFLAGS="-I$PWD/$LIBCFS_INCLUDE_DIR -I$TOP_DIR/lnet/include -I$TOP_DIR/lustre/include -I$PWD/lnet/include -I$PWD/lustre/include $CPPFLAGS"
+
+ LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"
+ AC_SUBST(LLCPPFLAGS)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/autoMakefile.am lustre/lustre/autoMakefile.am
+--- lustre~/lustre/autoMakefile.am 2010-01-23 03:07:58.000000000 +0100
++++ lustre/lustre/autoMakefile.am 2010-03-03 16:30:38.704635051 +0100
+@@ -85,7 +85,7 @@
+ BUILD_VER_H=$(top_builddir)/lustre/include/lustre/lustre_build_version.h
+
+ lustre_build_version:
+- perl $(top_builddir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
++ perl $(top_srcdir)/lustre/scripts/version_tag.pl $(top_srcdir) $(top_builddir) > tmpver
+ echo "#define LUSTRE_RELEASE @RELEASE@" >> tmpver
+ cmp -s $(BUILD_VER_H) tmpver > tmpdiff 2> /dev/null && \
+ $(RM) tmpver tmpdiff || \
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/scripts/version_tag.pl lustre/lustre/scripts/version_tag.pl
+--- lustre~/lustre/scripts/version_tag.pl 2010-03-03 14:44:38.000000000 +0100
++++ lustre/lustre/scripts/version_tag.pl 2010-03-03 16:33:54.136665590 +0100
+@@ -166,17 +166,19 @@
+ !$ver->open("$objdir/include/linux/version.h") &&
+ !$ver->open("$dir/include/linux/utsrelease.h") &&
+ !$ver->open("$dir/include/linux/version.h")) {
+- die "Run make dep on '$dir'\n";
+- }
++ #die "Run make dep on '$dir'\n";
++ $kernver = "UNKOWN-KERNEL";
++ } else {
+
+- while(defined($line = <$ver>)) {
+- $line =~ /\#define UTS_RELEASE "(.*)"/;
+- if ($1) {
+- $kernver = $1;
+- last;
+- }
+- }
+- $ver->close();
++ while(defined($line = <$ver>)) {
++ $line =~ /\#define UTS_RELEASE "(.*)"/;
++ if ($1) {
++ $kernver = $1;
++ last;
++ }
++ }
++ $ver->close();
++ }
+ chomp($kernver);
+ $dir =~ s/\//\./g;
+ return $dir;
+@@ -254,6 +256,8 @@
+ if (!defined($ENV{LUSTRE_VERS}));
+
+ if ($progname eq "version_tag.pl") {
++ chdir($cwd);
++ chdir($ARGV[1]);
+ my $linuxdir = get_linuxdir();
+ $linuxdir =~ s/\//\./g;
+ generate_ver($tag, $mtime, $linuxdir);
diff --git a/debian/patches/fix-symlink-attack.dpatch b/debian/patches/fix-symlink-attack.dpatch
deleted file mode 100755
index d1ef20d..0000000
--- a/debian/patches/fix-symlink-attack.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix-symlink-attack.dpatch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix symlink attack on runiozone
-
- at DPATCH@
-diff -urNad lustre-1.6.5.1~/lustre/tests/runiozone lustre-1.6.5.1/lustre/tests/runiozone
---- lustre-1.6.5.1~/lustre/tests/runiozone 2007-02-10 07:33:10.000000000 +0100
-+++ lustre-1.6.5.1/lustre/tests/runiozone 2008-08-27 16:58:36.000000000 +0200
-@@ -9,9 +9,11 @@
- LOOP=0
- rm -f endiozone
- echo 0 > /proc/sys/lnet/debug
-+tmpfile=$(mktemp -t iozone.XXXXXXXXXXXX)
- while date; do
- LOOP=`expr $LOOP + 1`
- echo "Test #$LOOP"
- iozone $VERIFY $ODIR -r $REC -i 0 -i 1 -f $FILE -s $SIZE 2>&1 || exit $?
- [ -f endiozone -o $LOOP -ge $COUNT ] && rm -f endiozone && exit 0
--done | tee /tmp/iozone.log
-+done | tee $tmpfile
-+echo "You'll find the log of this iozone run at: $tmpfile"
diff --git a/debian/patches/fix-symlink-attack.patch b/debian/patches/fix-symlink-attack.patch
new file mode 100755
index 0000000..03406d5
--- /dev/null
+++ b/debian/patches/fix-symlink-attack.patch
@@ -0,0 +1,19 @@
+## fix-symlink-attack.dpatch by Patrick Winnertz <winnie at debian.org>
+## DP: Fix symlink attack on runiozone
+
+diff -urNad lustre-1.6.5.1~/lustre/tests/runiozone lustre-1.6.5.1/lustre/tests/runiozone
+--- lustre-1.6.5.1~/lustre/tests/runiozone 2007-02-10 07:33:10.000000000 +0100
++++ lustre-1.6.5.1/lustre/tests/runiozone 2008-08-27 16:58:36.000000000 +0200
+@@ -9,9 +9,11 @@
+ LOOP=0
+ rm -f endiozone
+ echo 0 > /proc/sys/lnet/debug
++tmpfile=$(mktemp -t iozone.XXXXXXXXXXXX)
+ while date; do
+ LOOP=`expr $LOOP + 1`
+ echo "Test #$LOOP"
+ iozone $VERIFY $ODIR -r $REC -i 0 -i 1 -f $FILE -s $SIZE 2>&1 || exit $?
+ [ -f endiozone -o $LOOP -ge $COUNT ] && rm -f endiozone && exit 0
+-done | tee /tmp/iozone.log
++done | tee $tmpfile
++echo "You'll find the log of this iozone run at: $tmpfile"
diff --git a/debian/patches/fix_bashisms_for_dash.dpatch b/debian/patches/fix_bashisms_for_dash.dpatch
deleted file mode 100755
index ba7385f..0000000
--- a/debian/patches/fix_bashisms_for_dash.dpatch
+++ /dev/null
@@ -1,55 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## remove-set_tunables.dpatch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: fix some bashisms by switching the interpreter from sh to bash
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/ldiskfs/configure.ac lustre/ldiskfs/configure.ac
---- lustre~/ldiskfs/configure.ac 2010-07-28 14:28:02.884964948 +0200
-+++ lustre/ldiskfs/configure.ac 2010-07-28 14:28:03.136965577 +0200
-@@ -91,7 +91,7 @@
- fi
-
- AC_SUBST(BACKFS)
--BACKFSU=${BACKFS/ext/EXT}
-+BACKFSU=`echo $BACKFS | sed -e 's#ext#EXT#'`
- AC_SUBST(BACKFSU) # We need a Upper string
-
- AM_CONDITIONAL(USE_EXT4, test x$enable_ext4 = xyes)
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/tests/llog-test.sh lustre/lustre/tests/llog-test.sh
---- lustre~/lustre/tests/llog-test.sh 2010-01-11 04:29:50.000000000 +0100
-+++ lustre/lustre/tests/llog-test.sh 2010-07-28 14:28:03.136965577 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- set -e
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/tests/lnet-selftest.sh lustre/lustre/tests/lnet-selftest.sh
---- lustre~/lustre/tests/lnet-selftest.sh 2010-04-10 02:28:57.000000000 +0200
-+++ lustre/lustre/tests/lnet-selftest.sh 2010-07-28 14:28:24.855977956 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
- . $LUSTRE/tests/test-framework.sh
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/tests/mdsrate-stat-large.sh lustre/lustre/tests/mdsrate-stat-large.sh
---- lustre~/lustre/tests/mdsrate-stat-large.sh 2010-04-10 02:28:57.000000000 +0200
-+++ lustre/lustre/tests/mdsrate-stat-large.sh 2010-07-28 14:28:03.136965577 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- #
- # This test was used in a set of CMD3 tests (cmd3-8 test).
-
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/tests/rundbench lustre/lustre/tests/rundbench
---- lustre~/lustre/tests/rundbench 2010-01-11 04:29:50.000000000 +0100
-+++ lustre/lustre/tests/rundbench 2010-07-28 14:28:03.136965577 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
- . $LUSTRE/tests/test-framework.sh
diff --git a/debian/patches/fix_bashisms_for_dash.patch b/debian/patches/fix_bashisms_for_dash.patch
new file mode 100755
index 0000000..8cdbe78
--- /dev/null
+++ b/debian/patches/fix_bashisms_for_dash.patch
@@ -0,0 +1,51 @@
+## remove-set_tunables.dpatch by Patrick Winnertz <winnie at debian.org>
+## DP: fix some bashisms by switching the interpreter from sh to bash
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/ldiskfs/configure.ac lustre/ldiskfs/configure.ac
+--- lustre~/ldiskfs/configure.ac 2010-07-28 14:28:02.884964948 +0200
++++ lustre/ldiskfs/configure.ac 2010-07-28 14:28:03.136965577 +0200
+@@ -91,7 +91,7 @@
+ fi
+
+ AC_SUBST(BACKFS)
+-BACKFSU=${BACKFS/ext/EXT}
++BACKFSU=`echo $BACKFS | sed -e 's#ext#EXT#'`
+ AC_SUBST(BACKFSU) # We need a Upper string
+
+ AM_CONDITIONAL(USE_EXT4, test x$enable_ext4 = xyes)
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/tests/llog-test.sh lustre/lustre/tests/llog-test.sh
+--- lustre~/lustre/tests/llog-test.sh 2010-01-11 04:29:50.000000000 +0100
++++ lustre/lustre/tests/llog-test.sh 2010-07-28 14:28:03.136965577 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ set -e
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/tests/lnet-selftest.sh lustre/lustre/tests/lnet-selftest.sh
+--- lustre~/lustre/tests/lnet-selftest.sh 2010-04-10 02:28:57.000000000 +0200
++++ lustre/lustre/tests/lnet-selftest.sh 2010-07-28 14:28:24.855977956 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+ . $LUSTRE/tests/test-framework.sh
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/tests/mdsrate-stat-large.sh lustre/lustre/tests/mdsrate-stat-large.sh
+--- lustre~/lustre/tests/mdsrate-stat-large.sh 2010-04-10 02:28:57.000000000 +0200
++++ lustre/lustre/tests/mdsrate-stat-large.sh 2010-07-28 14:28:03.136965577 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ #
+ # This test was used in a set of CMD3 tests (cmd3-8 test).
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/tests/rundbench lustre/lustre/tests/rundbench
+--- lustre~/lustre/tests/rundbench 2010-01-11 04:29:50.000000000 +0100
++++ lustre/lustre/tests/rundbench 2010-07-28 14:28:03.136965577 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ LUSTRE=${LUSTRE:-$(cd $(dirname $0)/..; echo $PWD)}
+ . $LUSTRE/tests/test-framework.sh
diff --git a/debian/patches/fix_dentry_conf_test.dpatch b/debian/patches/fix_dentry_conf_test.dpatch
deleted file mode 100755
index ca85a71..0000000
--- a/debian/patches/fix_dentry_conf_test.dpatch
+++ /dev/null
@@ -1,25 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no_default_debugging.patch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: HAVE_LINUX_EXPORTFS_H not defined in configure target :S
-
- at DPATCH@
-diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
-index d01d8e0..ac8eb0e 100644
---- a/lustre/autoconf/lustre-core.m4
-+++ b/lustre/autoconf/lustre-core.m4
-@@ -1243,11 +1243,8 @@ LB_LINUX_TRY_COMPILE([
- AC_DEFUN([LC_FH_TO_DENTRY],
- [AC_MSG_CHECKING([if kernel has .fh_to_dentry member in export_operations struct])
- LB_LINUX_TRY_COMPILE([
--#ifdef HAVE_LINUX_EXPORTFS_H
-- #include <linux/exportfs.h>
--#else
-- #include <linux/fs.h>
--#endif
-+#include <linux/exportfs.h>
-+#include <linux/fs.h>
- ],[
- struct export_operations exp;
-
diff --git a/debian/patches/fix_dentry_conf_test.patch b/debian/patches/fix_dentry_conf_test.patch
new file mode 100755
index 0000000..02feaa1
--- /dev/null
+++ b/debian/patches/fix_dentry_conf_test.patch
@@ -0,0 +1,21 @@
+## no_default_debugging.patch by Patrick Winnertz <winnie at debian.org>
+## DP: HAVE_LINUX_EXPORTFS_H not defined in configure target :S
+
+diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
+index d01d8e0..ac8eb0e 100644
+--- a/lustre/autoconf/lustre-core.m4
++++ b/lustre/autoconf/lustre-core.m4
+@@ -1243,11 +1243,8 @@ LB_LINUX_TRY_COMPILE([
+ AC_DEFUN([LC_FH_TO_DENTRY],
+ [AC_MSG_CHECKING([if kernel has .fh_to_dentry member in export_operations struct])
+ LB_LINUX_TRY_COMPILE([
+-#ifdef HAVE_LINUX_EXPORTFS_H
+- #include <linux/exportfs.h>
+-#else
+- #include <linux/fs.h>
+-#endif
++#include <linux/exportfs.h>
++#include <linux/fs.h>
+ ],[
+ struct export_operations exp;
+
diff --git a/debian/patches/fix_various_typecasts.dpatch b/debian/patches/fix_various_typecasts.dpatch
deleted file mode 100755
index 8898975..0000000
--- a/debian/patches/fix_various_typecasts.dpatch
+++ /dev/null
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## autogen.dpatch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: as we compile now with -Werror add typecasts for the printf stuff in sanity.c
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/liblustre/tests/sanity.c lustre/lustre/liblustre/tests/sanity.c
---- lustre~/lustre/liblustre/tests/sanity.c 2010-03-03 14:44:38.000000000 +0100
-+++ lustre/lustre/liblustre/tests/sanity.c 2010-03-03 18:18:43.028668969 +0100
-@@ -705,7 +705,7 @@
- }
-
- t_fcntl(fd, F_SETFL, O_APPEND);
-- if (!(ret = t_fcntl(fd, F_GETFL)) & O_APPEND) {
-+ if ((!(ret = t_fcntl(fd, F_GETFL))) & O_APPEND) {
- printf("error get flag: ret %x\n", ret);
- return(-1);
- }
diff --git a/debian/patches/fix_various_typecasts.patch b/debian/patches/fix_various_typecasts.patch
new file mode 100755
index 0000000..6f2231d
--- /dev/null
+++ b/debian/patches/fix_various_typecasts.patch
@@ -0,0 +1,15 @@
+## autogen.dpatch by Patrick Winnertz <winnie at debian.org>
+## DP: as we compile now with -Werror add typecasts for the printf stuff in sanity.c
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/liblustre/tests/sanity.c lustre/lustre/liblustre/tests/sanity.c
+--- lustre~/lustre/liblustre/tests/sanity.c 2010-03-03 14:44:38.000000000 +0100
++++ lustre/lustre/liblustre/tests/sanity.c 2010-03-03 18:18:43.028668969 +0100
+@@ -705,7 +705,7 @@
+ }
+
+ t_fcntl(fd, F_SETFL, O_APPEND);
+- if (!(ret = t_fcntl(fd, F_GETFL)) & O_APPEND) {
++ if ((!(ret = t_fcntl(fd, F_GETFL))) & O_APPEND) {
+ printf("error get flag: ret %x\n", ret);
+ return(-1);
+ }
diff --git a/debian/patches/fix_version_tag-pl.dpatch b/debian/patches/fix_version_tag-pl.dpatch
deleted file mode 100755
index b0548fa..0000000
--- a/debian/patches/fix_version_tag-pl.dpatch
+++ /dev/null
@@ -1,21 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## fix_version_tag-pl.dpatch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/scripts/version_tag.pl lustre/lustre/scripts/version_tag.pl
---- lustre~/lustre/scripts/version_tag.pl 2010-01-11 04:29:50.000000000 +0100
-+++ lustre/lustre/scripts/version_tag.pl 2010-08-04 12:25:25.942494281 +0200
-@@ -125,8 +125,8 @@
- $last_mtime = time();
- } else {
- my $tree_status = new IO::File;
-- if (!$tree_status->open("tree_status")) {
-- die "unable to open the tree_status file: $!\n";
-+ if (!$tree_status->open("configure")) {
-+ die "unable to open the configure file: $!\n";
- }
- my $line;
- while (defined($line = <$tree_status>)) {
diff --git a/debian/patches/fix_version_tag-pl.patch b/debian/patches/fix_version_tag-pl.patch
new file mode 100755
index 0000000..b818ef0
--- /dev/null
+++ b/debian/patches/fix_version_tag-pl.patch
@@ -0,0 +1,17 @@
+## fix_version_tag-pl.dpatch by Patrick Winnertz <winnie at debian.org>
+## DP: No description.
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/scripts/version_tag.pl lustre/lustre/scripts/version_tag.pl
+--- lustre~/lustre/scripts/version_tag.pl 2010-01-11 04:29:50.000000000 +0100
++++ lustre/lustre/scripts/version_tag.pl 2010-08-04 12:25:25.942494281 +0200
+@@ -125,8 +125,8 @@
+ $last_mtime = time();
+ } else {
+ my $tree_status = new IO::File;
+- if (!$tree_status->open("tree_status")) {
+- die "unable to open the tree_status file: $!\n";
++ if (!$tree_status->open("configure")) {
++ die "unable to open the configure file: $!\n";
+ }
+ my $line;
+ while (defined($line = <$tree_status>)) {
diff --git a/debian/patches/inode-no-i_blksize-2.6.20.dpatch b/debian/patches/inode-no-i_blksize-2.6.20.dpatch
deleted file mode 100755
index 6a9c84f..0000000
--- a/debian/patches/inode-no-i_blksize-2.6.20.dpatch
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## inode-no-i_blksize-2.6.20.patch by Goswin von Brederlow <goswin-v-b at web.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch from Q-Leap Networks
-
- at DPATCH@
-diff -urNad lustre-1.6.2~/lustre/mds/handler.c lustre-1.6.2/lustre/mds/handler.c
---- lustre-1.6.2~/lustre/mds/handler.c 2007-09-06 14:41:18.000000000 +0200
-+++ lustre-1.6.2/lustre/mds/handler.c 2007-09-06 14:47:31.185757912 +0200
-@@ -1191,6 +1191,7 @@
- struct lvfs_run_ctxt saved;
- int rc, size[2] = { sizeof(struct ptlrpc_body), sizeof(*repbody) };
- struct lvfs_ucred uc = {NULL,};
-+ int blksize;
- ENTRY;
-
- if (OBD_FAIL_CHECK(OBD_FAIL_MDS_READPAGE_PACK))
-@@ -1223,17 +1224,18 @@
- if (IS_ERR(file))
- GOTO(out_pop, rc = PTR_ERR(file));
-
-+ blksize = de->d_inode->i_sb->s_blocksize;
- /* body->size is actually the offset -eeb */
-- if ((body->size & (de->d_inode->i_sb->s_blocksize - 1)) != 0) {
-+ if ((body->size & (blksize - 1)) != 0) {
- CERROR("offset "LPU64" not on a block boundary of %lu\n",
-- body->size, de->d_inode->i_sb->s_blocksize);
-+ body->size, blksize);
- GOTO(out_file, rc = -EFAULT);
- }
-
- /* body->nlink is actually the #bytes to read -eeb */
-- if (body->nlink & (de->d_inode->i_sb->s_blocksize - 1)) {
-+ if (body->nlink & (blksize - 1)) {
- CERROR("size %u is not multiple of blocksize %lu\n",
-- body->nlink, de->d_inode->i_sb->s_blocksize);
-+ body->nlink, blksize);
- GOTO(out_file, rc = -EFAULT);
- }
-
diff --git a/debian/patches/inode-no-i_blksize-2.6.20.patch b/debian/patches/inode-no-i_blksize-2.6.20.patch
new file mode 100755
index 0000000..b793444
--- /dev/null
+++ b/debian/patches/inode-no-i_blksize-2.6.20.patch
@@ -0,0 +1,37 @@
+## inode-no-i_blksize-2.6.20.patch by Goswin von Brederlow <goswin-v-b at web.de>
+## DP: Patch from Q-Leap Networks
+
+diff -urNad lustre-1.6.2~/lustre/mds/handler.c lustre-1.6.2/lustre/mds/handler.c
+--- lustre-1.6.2~/lustre/mds/handler.c 2007-09-06 14:41:18.000000000 +0200
++++ lustre-1.6.2/lustre/mds/handler.c 2007-09-06 14:47:31.185757912 +0200
+@@ -1191,6 +1191,7 @@
+ struct lvfs_run_ctxt saved;
+ int rc, size[2] = { sizeof(struct ptlrpc_body), sizeof(*repbody) };
+ struct lvfs_ucred uc = {NULL,};
++ int blksize;
+ ENTRY;
+
+ if (OBD_FAIL_CHECK(OBD_FAIL_MDS_READPAGE_PACK))
+@@ -1223,17 +1224,18 @@
+ if (IS_ERR(file))
+ GOTO(out_pop, rc = PTR_ERR(file));
+
++ blksize = de->d_inode->i_sb->s_blocksize;
+ /* body->size is actually the offset -eeb */
+- if ((body->size & (de->d_inode->i_sb->s_blocksize - 1)) != 0) {
++ if ((body->size & (blksize - 1)) != 0) {
+ CERROR("offset "LPU64" not on a block boundary of %lu\n",
+- body->size, de->d_inode->i_sb->s_blocksize);
++ body->size, blksize);
+ GOTO(out_file, rc = -EFAULT);
+ }
+
+ /* body->nlink is actually the #bytes to read -eeb */
+- if (body->nlink & (de->d_inode->i_sb->s_blocksize - 1)) {
++ if (body->nlink & (blksize - 1)) {
+ CERROR("size %u is not multiple of blocksize %lu\n",
+- body->nlink, de->d_inode->i_sb->s_blocksize);
++ body->nlink, blksize);
+ GOTO(out_file, rc = -EFAULT);
+ }
+
diff --git a/debian/patches/ldiskfs-detect-2.6.20-2.6.22.dpatch b/debian/patches/ldiskfs-detect-2.6.20-2.6.22.dpatch
deleted file mode 100755
index b84a30d..0000000
--- a/debian/patches/ldiskfs-detect-2.6.20-2.6.22.dpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ldiskfs-detect-2.6.20-2.6.22.dpatch by Goswin von Brederlow <goswin-v-b at web.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch from Q-Leap Networks modified by Patrick winnertz <patrick.winnertz at credativ.de>
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/ldiskfs/configure.ac lustre/ldiskfs/configure.ac
---- lustre~/ldiskfs/configure.ac 2010-03-03 17:25:38.000000000 +0100
-+++ lustre/ldiskfs/configure.ac 2010-03-04 14:53:13.608332585 +0100
-@@ -112,11 +112,16 @@
- else
- LDISKFS_SERIES="2.6-rhel5.series"
- fi
-- else
-+ else
-+ if test -e $LINUX_OBJ/version.Debian; then
-+ LDISKFS_SERIES="2.6.18-debian.series"
-+ else
- LDISKFS_SERIES="2.6.18-vanilla.series"
-+ fi
- fi
- ;;
- 2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
-+2.6.26*) LDISKFS_SERIES="2.6.26-vanilla.series";;
- 2.6.27*) LDISKFS_SERIES="2.6-sles11.series";;
- *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac])
- esac
diff --git a/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch b/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch
new file mode 100755
index 0000000..8b7974c
--- /dev/null
+++ b/debian/patches/ldiskfs-detect-2.6.20-2.6.22.patch
@@ -0,0 +1,24 @@
+## ldiskfs-detect-2.6.20-2.6.22.dpatch by Goswin von Brederlow <goswin-v-b at web.de>
+## DP: Patch from Q-Leap Networks modified by Patrick winnertz <patrick.winnertz at credativ.de>
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/ldiskfs/configure.ac lustre/ldiskfs/configure.ac
+--- lustre~/ldiskfs/configure.ac 2010-03-03 17:25:38.000000000 +0100
++++ lustre/ldiskfs/configure.ac 2010-03-04 14:53:13.608332585 +0100
+@@ -112,11 +112,16 @@
+ else
+ LDISKFS_SERIES="2.6-rhel5.series"
+ fi
+- else
++ else
++ if test -e $LINUX_OBJ/version.Debian; then
++ LDISKFS_SERIES="2.6.18-debian.series"
++ else
+ LDISKFS_SERIES="2.6.18-vanilla.series"
++ fi
+ fi
+ ;;
+ 2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
++2.6.26*) LDISKFS_SERIES="2.6.26-vanilla.series";;
+ 2.6.27*) LDISKFS_SERIES="2.6-sles11.series";;
+ *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix ldiskfs/configure.ac])
+ esac
diff --git a/debian/patches/libsysio.dpatch b/debian/patches/libsysio.dpatch
deleted file mode 100755
index 6a3e23a..0000000
--- a/debian/patches/libsysio.dpatch
+++ /dev/null
@@ -1,18 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## libsysio.dpatch by Goswin von Brederlow <goswin-v-b at web.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Use path relative to $srcdir instead of PWD to allow using a builddir
-
- at DPATCH@
---- lustre-1.6.0.1/lustre/liblustre/Makefile.am~ 2004-12-20 00:06:24.000000000 +0100
-+++ lustre-1.6.0.1/lustre/liblustre/Makefile.am 2007-07-20 12:33:52.000000000 +0200
-@@ -1,7 +1,7 @@
- ## Liblustre excecutables & libraries Makefile
- SUBDIRS = . tests
-
--AM_CPPFLAGS = $(HAVE_EFENCE) -I$(SYSIO)/include -D_LARGEFILE64_SOURCE=1 \
-+AM_CPPFLAGS = $(HAVE_EFENCE) -I$(top_srcdir)/libsysio/include -D_LARGEFILE64_SOURCE=1 \
- $(LLCPPFLAGS) -I$(top_srcdir)/lnet/ulnds
- AM_CFLAGS = $(LLCFLAGS)
-
diff --git a/debian/patches/libsysio.patch b/debian/patches/libsysio.patch
new file mode 100755
index 0000000..af47e5b
--- /dev/null
+++ b/debian/patches/libsysio.patch
@@ -0,0 +1,14 @@
+## libsysio.dpatch by Goswin von Brederlow <goswin-v-b at web.de>
+## DP: Use path relative to $srcdir instead of PWD to allow using a builddir
+
+--- lustre-1.6.0.1/lustre/liblustre/Makefile.am~ 2004-12-20 00:06:24.000000000 +0100
++++ lustre-1.6.0.1/lustre/liblustre/Makefile.am 2007-07-20 12:33:52.000000000 +0200
+@@ -1,7 +1,7 @@
+ ## Liblustre excecutables & libraries Makefile
+ SUBDIRS = . tests
+
+-AM_CPPFLAGS = $(HAVE_EFENCE) -I$(SYSIO)/include -D_LARGEFILE64_SOURCE=1 \
++AM_CPPFLAGS = $(HAVE_EFENCE) -I$(top_srcdir)/libsysio/include -D_LARGEFILE64_SOURCE=1 \
+ $(LLCPPFLAGS) -I$(top_srcdir)/lnet/ulnds
+ AM_CFLAGS = $(LLCFLAGS)
+
diff --git a/debian/patches/lustre_config.dpatch b/debian/patches/lustre_config.dpatch
deleted file mode 100755
index 2dac5fd..0000000
--- a/debian/patches/lustre_config.dpatch
+++ /dev/null
@@ -1,103 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## lustre_config.dpatch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Hard coded path to lc_common... not the best solution, but a solution
-
- at DPATCH@
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_cluman.in lustre-1.6.4.1/lustre/scripts/lc_cluman.in
---- lustre-1.6.4.1~/lustre/scripts/lc_cluman.in 2007-03-23 03:31:10.000000000 +0100
-+++ lustre-1.6.4.1/lustre/scripts/lc_cluman.in 2007-12-21 12:04:45.000000000 +0100
-@@ -38,7 +38,7 @@
- }
-
- # Get the library of functions
--. @scriptlibdir@/lc_common
-+. /usr/share/lustre/lc_common
-
- #****************************** Global variables ******************************#
- TMP_DIR=${CLUMGR_TMP_DIR} # Temporary directory
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_hb.in lustre-1.6.4.1/lustre/scripts/lc_hb.in
---- lustre-1.6.4.1~/lustre/scripts/lc_hb.in 2007-03-23 03:31:10.000000000 +0100
-+++ lustre-1.6.4.1/lustre/scripts/lc_hb.in 2007-12-21 12:04:58.000000000 +0100
-@@ -31,7 +31,7 @@
- }
-
- # Get the library of functions
--. @scriptlibdir@/lc_common
-+. /usr/share/lustre/lc_common
-
- #****************************** Global variables ******************************#
- # Heartbeat tools
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_lvm.in lustre-1.6.4.1/lustre/scripts/lc_lvm.in
---- lustre-1.6.4.1~/lustre/scripts/lc_lvm.in 2007-03-23 03:31:10.000000000 +0100
-+++ lustre-1.6.4.1/lustre/scripts/lc_lvm.in 2007-12-21 12:05:15.000000000 +0100
-@@ -118,7 +118,7 @@
- }
-
- # Get the library of functions
--. @scriptlibdir@/lc_common
-+. /usr/share/lustre/lc_common
-
- #***************************** Global variables *****************************#
- # All the LVM device items in the csv file
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_md.in lustre-1.6.4.1/lustre/scripts/lc_md.in
---- lustre-1.6.4.1~/lustre/scripts/lc_md.in 2007-06-09 09:09:09.000000000 +0200
-+++ lustre-1.6.4.1/lustre/scripts/lc_md.in 2007-12-21 12:05:31.000000000 +0100
-@@ -70,7 +70,7 @@
- }
-
- # Get the library of functions
--. @scriptlibdir@/lc_common
-+. /usr/share/lustre/lc_common
-
- #***************************** Global variables *****************************#
- # All the MD device items in the csv file
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_modprobe.in lustre-1.6.4.1/lustre/scripts/lc_modprobe.in
---- lustre-1.6.4.1~/lustre/scripts/lc_modprobe.in 2007-03-23 03:31:10.000000000 +0100
-+++ lustre-1.6.4.1/lustre/scripts/lc_modprobe.in 2007-12-21 12:05:50.000000000 +0100
-@@ -6,7 +6,7 @@
- #################################################################################
-
- # Get the library of functions
--. @scriptlibdir@/lc_common
-+. /usr/share/lustre/lc_common
-
- # Check the kernel version
- KERNEL_VERSION=`uname -r`
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_net.in lustre-1.6.4.1/lustre/scripts/lc_net.in
---- lustre-1.6.4.1~/lustre/scripts/lc_net.in 2007-03-23 03:31:10.000000000 +0100
-+++ lustre-1.6.4.1/lustre/scripts/lc_net.in 2007-12-21 12:06:06.000000000 +0100
-@@ -27,7 +27,7 @@
- }
-
- # Get the library of functions
--. @scriptlibdir@/lc_common
-+. /usr/share/lustre/lc_common
-
- VERBOSE_OUTPUT=false
- # Get and check the positional parameters
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lustre_config.in lustre-1.6.4.1/lustre/scripts/lustre_config.in
---- lustre-1.6.4.1~/lustre/scripts/lustre_config.in 2007-10-14 06:33:14.000000000 +0200
-+++ lustre-1.6.4.1/lustre/scripts/lustre_config.in 2007-12-21 12:04:25.000000000 +0100
-@@ -230,7 +230,7 @@
- }
-
- # Get the library of functions
--. @scriptlibdir@/lc_common
-+. /usr/share/lustre/lc_common
-
- #***************************** Global variables *****************************#
- declare -a MGS_NODENAME # node names of the MGS servers
-diff -urNad lustre-1.6.4.1~/lustre/scripts/lustre_createcsv.in lustre-1.6.4.1/lustre/scripts/lustre_createcsv.in
---- lustre-1.6.4.1~/lustre/scripts/lustre_createcsv.in 2007-10-14 06:33:14.000000000 +0200
-+++ lustre-1.6.4.1/lustre/scripts/lustre_createcsv.in 2007-12-21 12:06:43.000000000 +0100
-@@ -37,7 +37,7 @@
- }
-
- # Get the library of functions
--. @scriptlibdir@/lc_common
-+. /usr/share/lustre/lc_common
-
- #**************************** Global variables ****************************#
- # csv file
diff --git a/debian/patches/lustre_config.patch b/debian/patches/lustre_config.patch
new file mode 100755
index 0000000..7074710
--- /dev/null
+++ b/debian/patches/lustre_config.patch
@@ -0,0 +1,99 @@
+## lustre_config.dpatch by Patrick Winnertz <winnie at debian.org>
+## DP: Hard coded path to lc_common... not the best solution, but a solution
+
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_cluman.in lustre-1.6.4.1/lustre/scripts/lc_cluman.in
+--- lustre-1.6.4.1~/lustre/scripts/lc_cluman.in 2007-03-23 03:31:10.000000000 +0100
++++ lustre-1.6.4.1/lustre/scripts/lc_cluman.in 2007-12-21 12:04:45.000000000 +0100
+@@ -38,7 +38,7 @@
+ }
+
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+
+ #****************************** Global variables ******************************#
+ TMP_DIR=${CLUMGR_TMP_DIR} # Temporary directory
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_hb.in lustre-1.6.4.1/lustre/scripts/lc_hb.in
+--- lustre-1.6.4.1~/lustre/scripts/lc_hb.in 2007-03-23 03:31:10.000000000 +0100
++++ lustre-1.6.4.1/lustre/scripts/lc_hb.in 2007-12-21 12:04:58.000000000 +0100
+@@ -31,7 +31,7 @@
+ }
+
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+
+ #****************************** Global variables ******************************#
+ # Heartbeat tools
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_lvm.in lustre-1.6.4.1/lustre/scripts/lc_lvm.in
+--- lustre-1.6.4.1~/lustre/scripts/lc_lvm.in 2007-03-23 03:31:10.000000000 +0100
++++ lustre-1.6.4.1/lustre/scripts/lc_lvm.in 2007-12-21 12:05:15.000000000 +0100
+@@ -118,7 +118,7 @@
+ }
+
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+
+ #***************************** Global variables *****************************#
+ # All the LVM device items in the csv file
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_md.in lustre-1.6.4.1/lustre/scripts/lc_md.in
+--- lustre-1.6.4.1~/lustre/scripts/lc_md.in 2007-06-09 09:09:09.000000000 +0200
++++ lustre-1.6.4.1/lustre/scripts/lc_md.in 2007-12-21 12:05:31.000000000 +0100
+@@ -70,7 +70,7 @@
+ }
+
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+
+ #***************************** Global variables *****************************#
+ # All the MD device items in the csv file
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_modprobe.in lustre-1.6.4.1/lustre/scripts/lc_modprobe.in
+--- lustre-1.6.4.1~/lustre/scripts/lc_modprobe.in 2007-03-23 03:31:10.000000000 +0100
++++ lustre-1.6.4.1/lustre/scripts/lc_modprobe.in 2007-12-21 12:05:50.000000000 +0100
+@@ -6,7 +6,7 @@
+ #################################################################################
+
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+
+ # Check the kernel version
+ KERNEL_VERSION=`uname -r`
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lc_net.in lustre-1.6.4.1/lustre/scripts/lc_net.in
+--- lustre-1.6.4.1~/lustre/scripts/lc_net.in 2007-03-23 03:31:10.000000000 +0100
++++ lustre-1.6.4.1/lustre/scripts/lc_net.in 2007-12-21 12:06:06.000000000 +0100
+@@ -27,7 +27,7 @@
+ }
+
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+
+ VERBOSE_OUTPUT=false
+ # Get and check the positional parameters
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lustre_config.in lustre-1.6.4.1/lustre/scripts/lustre_config.in
+--- lustre-1.6.4.1~/lustre/scripts/lustre_config.in 2007-10-14 06:33:14.000000000 +0200
++++ lustre-1.6.4.1/lustre/scripts/lustre_config.in 2007-12-21 12:04:25.000000000 +0100
+@@ -230,7 +230,7 @@
+ }
+
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+
+ #***************************** Global variables *****************************#
+ declare -a MGS_NODENAME # node names of the MGS servers
+diff -urNad lustre-1.6.4.1~/lustre/scripts/lustre_createcsv.in lustre-1.6.4.1/lustre/scripts/lustre_createcsv.in
+--- lustre-1.6.4.1~/lustre/scripts/lustre_createcsv.in 2007-10-14 06:33:14.000000000 +0200
++++ lustre-1.6.4.1/lustre/scripts/lustre_createcsv.in 2007-12-21 12:06:43.000000000 +0100
+@@ -37,7 +37,7 @@
+ }
+
+ # Get the library of functions
+-. @scriptlibdir@/lc_common
++. /usr/share/lustre/lc_common
+
+ #**************************** Global variables ****************************#
+ # csv file
diff --git a/debian/patches/lustre_manpage.dpatch b/debian/patches/lustre_manpage.dpatch
deleted file mode 100755
index 37d59b6..0000000
--- a/debian/patches/lustre_manpage.dpatch
+++ /dev/null
@@ -1,17 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## lustre_manpatch.dpatch by Patrick Winnert <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: registred symbol not allowed.
-
---- lustre-1.6.0.1/lustre/doc/lustre.7 2007-07-20 14:27:09.000000000 +0200
-+++ lustre-1.6.0.1/lustre/doc/lustre.7 2007-07-20 14:29:35.000000000 +0200
-@@ -8,7 +8,7 @@
- .SH SYNOPSIS
- A high-performance file system designed for clusters.
- .SH DESCRIPTION
--.B Lustre®
-+.B Lustre\[rg]
- is a high-performance, massively-scalable, POSIX-compliant network file system
- designed for the world's largest high-performance compute clusters. Lustre
- is under active development from Cluster FileSystems (http://clusterfs.com).
diff --git a/debian/patches/lustre_manpage.patch b/debian/patches/lustre_manpage.patch
new file mode 100755
index 0000000..1be2e19
--- /dev/null
+++ b/debian/patches/lustre_manpage.patch
@@ -0,0 +1,14 @@
+## lustre_manpatch.dpatch by Patrick Winnert <winnie at debian.org>
+## DP: registred symbol not allowed.
+
+--- lustre-1.6.0.1/lustre/doc/lustre.7 2007-07-20 14:27:09.000000000 +0200
++++ lustre-1.6.0.1/lustre/doc/lustre.7 2007-07-20 14:29:35.000000000 +0200
+@@ -8,7 +8,7 @@
+ .SH SYNOPSIS
+ A high-performance file system designed for clusters.
+ .SH DESCRIPTION
+-.B Lustre®
++.B Lustre\[rg]
+ is a high-performance, massively-scalable, POSIX-compliant network file system
+ designed for the world's largest high-performance compute clusters. Lustre
+ is under active development from Cluster FileSystems (http://clusterfs.com).
diff --git a/debian/patches/no-darwin.dpatch b/debian/patches/no-darwin.dpatch
deleted file mode 100755
index 37e16d9..0000000
--- a/debian/patches/no-darwin.dpatch
+++ /dev/null
@@ -1,528 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no-darwin.dpatch by Goswin von Brederlow <goswin-v-b at web.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Remove faulty 'if DARWIN' blocks from autoMakefile.am files
-## DP: Remove darwin subdirs from autoMakefile.am files
-
- at DPATCH@
-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)
-
- 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 \
-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)
-
- EXTRA_DIST = api.h api-support.h \
- 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
-
--if DARWIN
--
-- macos_PROGRAMS := ksocklnd
--
-- nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c socklnd_modparams.c socklnd_lib-darwin.c
--
-- ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
-- ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
-- ksocklnd_LDADD := $(EXTRA_KLIBS)
--
-- plist_DATA := Info.plist
-- install_data_hook := fix-kext-ownership
-+#if DARWIN
-+#
-+# macos_PROGRAMS := ksocklnd
-+#
-+# nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c socklnd_modparams.c socklnd_lib-darwin.c
-+#
-+# ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
-+# ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
-+# ksocklnd_LDADD := $(EXTRA_KLIBS)
-+#
-+# plist_DATA := Info.plist
-+# install_data_hook := fix-kext-ownership
-
-- EXTRA_DIST := socklnd_lib-darwin.c socklnd_lib-darwin.h $(plist_DATA)
--endif # DARWIN
-+# EXTRA_DIST := socklnd_lib-darwin.c socklnd_lib-darwin.h $(plist_DATA)
-+#endif # DARWIN
-
- install-data-hook: $(install_data_hook)
-
-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)
-
- if LIBLUSTRE
- noinst_LIBRARIES= libcfs.a
-@@ -53,25 +53,25 @@
- modulenet_DATA := libcfs$(KMODEXT)
- endif
-
--if DARWIN
--macos_PROGRAMS := libcfs
--
--nodist_libcfs_SOURCES := darwin/darwin-sync.c darwin/darwin-mem.c \
-- darwin/darwin-prim.c darwin/darwin-fs.c darwin/darwin-curproc.c \
-- darwin/darwin-tcpip.c darwin/darwin-utils.c \
-- darwin/darwin-debug.c darwin/darwin-proc.c \
-- darwin/darwin-tracefile.c darwin/darwin-module.c \
-- debug.c module.c tracefile.c nidstrings.c watchdog.c
--
--libcfs_CFLAGS := $(EXTRA_KCFLAGS)
--libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
--libcfs_LDADD := $(EXTRA_KLIBS)
--
--plist_DATA := Info.plist
--
--install_data_hook := fix-kext-ownership
--
--endif
-+#if DARWIN
-+#macos_PROGRAMS := libcfs
-+#
-+#nodist_libcfs_SOURCES := darwin/darwin-sync.c darwin/darwin-mem.c \
-+# darwin/darwin-prim.c darwin/darwin-fs.c darwin/darwin-curproc.c \
-+# darwin/darwin-tcpip.c darwin/darwin-utils.c \
-+# darwin/darwin-debug.c darwin/darwin-proc.c \
-+# darwin/darwin-tracefile.c darwin/darwin-module.c \
-+# debug.c module.c tracefile.c nidstrings.c watchdog.c
-+#
-+#libcfs_CFLAGS := $(EXTRA_KCFLAGS)
-+#libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#libcfs_LDADD := $(EXTRA_KLIBS)
-+#
-+#plist_DATA := Info.plist
-+#
-+#install_data_hook := fix-kext-ownership
-+#
-+#endif
-
- endif
-
-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
-
--if DARWIN
--macos_PROGRAMS := lnet
--
--lnet_SOURCES := api-errno.c api-ni.c config.c
--lnet_SOURCES += lib-me.c lib-msg.c lib-eq.c lib-md.c
--lnet_SOURCES += lib-move.c module.c lo.c router.c router_proc.c
--lnet_SOURCES += acceptor.c peer.c
--
--lnet_CFLAGS := $(EXTRA_KCFLAGS)
--lnet_LDFLAGS := $(EXTRA_KLDFLAGS)
--lnet_LDADD := $(EXTRA_KLIBS)
--
--plist_DATA := Info.plist
--
--install_data_hook := fix-kext-ownership
--
--endif # DARWIN
-+#if DARWIN
-+#macos_PROGRAMS := lnet
-+#
-+#lnet_SOURCES := api-errno.c api-ni.c config.c
-+#lnet_SOURCES += lib-me.c lib-msg.c lib-eq.c lib-md.c
-+#lnet_SOURCES += lib-move.c module.c lo.c router.c router_proc.c
-+#lnet_SOURCES += acceptor.c peer.c
-+#
-+#lnet_CFLAGS := $(EXTRA_KCFLAGS)
-+#lnet_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#lnet_LDADD := $(EXTRA_KLIBS)
-+#
-+#plist_DATA := Info.plist
-+#
-+#install_data_hook := fix-kext-ownership
-+#
-+#endif # DARWIN
-
- endif # MODULES
-
-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
-
--if DARWIN
--macos_PROGRAMS := lov
-+#if DARWIN
-+#macos_PROGRAMS := lov
-
--lov_SOURCES := \
-- lov_log.c \
-- lov_pool.c \
-- lov_obd.c \
-- lov_pack.c \
-- lov_request.c \
-- lov_merge.c \
-- lov_qos.c \
-- lov_offset.c \
-- lov_internal.h
-+#lov_SOURCES := \
-+# lov_log.c \
-+# lov_pool.c \
-+# lov_obd.c \
-+# lov_pack.c \
-+# lov_request.c \
-+# lov_merge.c \
-+# lov_qos.c \
-+# lov_offset.c \
-+# lov_internal.h
-
--lov_CFLAGS := $(EXTRA_KCFLAGS)
--lov_LDFLAGS := $(EXTRA_KLDFLAGS)
--lov_LDADD := $(EXTRA_KLIBS)
-+#lov_CFLAGS := $(EXTRA_KCFLAGS)
-+#lov_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#lov_LDADD := $(EXTRA_KLIBS)
-
--plist_DATA := Info.plist
-+#plist_DATA := Info.plist
-
--install_data_hook := fix-kext-ownership
-+#install_data_hook := fix-kext-ownership
-
--endif # DARWIN
-+#endif # DARWIN
-
- endif # MODULES
-
-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
-
--if DARWIN
--
--macos_PROGRAMS := lvfs
--
--lvfs_SOURCES := lvfs_darwin.c
--
--lvfs_CFLAGS := $(EXTRA_KCFLAGS)
--lvfs_LDFLAGS := $(EXTRA_KLDFLAGS)
--lvfs_LDADD := $(EXTRA_KLIBS)
--
--plist_DATA := Info.plist
--
--install_data_hook := fix-kext-ownership
--
--endif # DARWIN
-+#if DARWIN
-+#
-+#macos_PROGRAMS := lvfs
-+#
-+#lvfs_SOURCES := lvfs_darwin.c
-+#
-+#lvfs_CFLAGS := $(EXTRA_KCFLAGS)
-+#lvfs_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#lvfs_LDADD := $(EXTRA_KLIBS)
-+#
-+#plist_DATA := Info.plist
-+#
-+#install_data_hook := fix-kext-ownership
-+#
-+#endif # DARWIN
-
- else # MODULES
-
-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)
-
- if LIBLUSTRE
-
-@@ -25,25 +25,25 @@
- noinst_DATA = llog_test$(KMODEXT)
- endif # LINUX
-
--if DARWIN
--macos_PROGRAMS := obdclass
--
--obdclass_SOURCES := \
-- darwin/darwin-module.c darwin/darwin-sysctl.c \
-- class_obd.c genops.c lprocfs_status.c \
-- lustre_handles.c lustre_peer.c obd_config.c \
-- obdo.c debug.c llog_ioctl.c uuid.c \
-- llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c
--
--obdclass_CFLAGS := $(EXTRA_KCFLAGS)
--obdclass_LDFLAGS := $(EXTRA_KLDFLAGS)
--obdclass_LDADD := $(EXTRA_KLIBS)
--
--plist_DATA := Info.plist
--
--install_data_hook := fix-kext-ownership
--
--endif # DARWIN
-+#if DARWIN
-+#macos_PROGRAMS := obdclass
-+#
-+#obdclass_SOURCES := \
-+# darwin/darwin-module.c darwin/darwin-sysctl.c \
-+# class_obd.c genops.c lprocfs_status.c \
-+# lustre_handles.c lustre_peer.c obd_config.c \
-+# obdo.c debug.c llog_ioctl.c uuid.c \
-+# llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c
-+#
-+#obdclass_CFLAGS := $(EXTRA_KCFLAGS)
-+#obdclass_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#obdclass_LDADD := $(EXTRA_KLIBS)
-+#
-+#plist_DATA := Info.plist
-+#
-+#install_data_hook := fix-kext-ownership
-+#
-+#endif # DARWIN
-
- endif # MODULES
-
-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
-
--if DARWIN
--macos_PROGRAMS := obdecho
--obdecho_SOURCES := \
-- lproc_echo.c \
-- echo.c \
-- echo_client.c
--
--obdecho_CFLAGS := $(EXTRA_KCFLAGS)
--obdecho_LDFLAGS := $(EXTRA_KLDFLAGS)
--obdecho_LDADD := $(EXTRA_KLIBS)
--
--plist_DATA := Info.plist
--
--install_data_hook := fix-kext-ownership
--
--endif # darwin
-+#if DARWIN
-+#macos_PROGRAMS := obdecho
-+#obdecho_SOURCES := \
-+# lproc_echo.c \
-+# echo.c \
-+# echo_client.c
-+#
-+#obdecho_CFLAGS := $(EXTRA_KCFLAGS)
-+#obdecho_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#obdecho_LDADD := $(EXTRA_KLIBS)
-+#
-+#plist_DATA := Info.plist
-+#
-+#install_data_hook := fix-kext-ownership
-+#
-+#endif # darwin
-
- endif # MODULES
-
-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
-
--if DARWIN
--macos_PROGRAMS := osc
--
--osc_SOURCES := \
-- osc_create.c \
-- osc_request.c
--
--osc_CFLAGS := $(EXTRA_KCFLAGS)
--osc_LDFLAGS := $(EXTRA_KLDFLAGS)
--osc_LDADD := $(EXTRA_KLIBS)
--
--plist_DATA := Info.plist
--
--install_data_hook := fix-kext-ownership
--
--endif # Darwin
-+#if DARWIN
-+#macos_PROGRAMS := osc
-+#
-+#osc_SOURCES := \
-+# osc_create.c \
-+# osc_request.c
-+#
-+#osc_CFLAGS := $(EXTRA_KCFLAGS)
-+#osc_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#osc_LDADD := $(EXTRA_KLIBS)
-+#
-+#plist_DATA := Info.plist
-+#
-+#install_data_hook := fix-kext-ownership
-+#
-+#endif # Darwin
-
- endif
-
-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
-
--if DARWIN
--macos_PROGRAMS := ptlrpc
--
--ptlrpc_SOURCES := \
-- ptlrpc_module.c \
-- client.c \
-- connection.c \
-- events.c \
-- import.c \
-- llog_client.c \
-- llog_net.c \
-- llog_server.c \
-- lproc_ptlrpc.c \
-- niobuf.c \
-- pack_generic.c \
-- pers.c \
-- pinger.c \
-- ptlrpcd.c \
-- recover.c \
-- recov_thread.c \
-- service.c \
-- wiretest.c \
-- $(LDLM_COMM_SOURCES)
--
--ptlrpc_CFLAGS := $(EXTRA_KCFLAGS)
--ptlrpc_LDFLAGS := $(EXTRA_KLDFLAGS)
--ptlrpc_LDADD := $(EXTRA_KLIBS)
--
--plist_DATA := Info.plist
--
--install_data_hook := fix-kext-ownership
--
--endif # DARWIN
-+#if DARWIN
-+#macos_PROGRAMS := ptlrpc
-+#
-+#ptlrpc_SOURCES := \
-+# ptlrpc_module.c \
-+# client.c \
-+# connection.c \
-+# events.c \
-+# import.c \
-+# llog_client.c \
-+# llog_net.c \
-+# llog_server.c \
-+# lproc_ptlrpc.c \
-+# niobuf.c \
-+# pack_generic.c \
-+# pers.c \
-+# pinger.c \
-+# ptlrpcd.c \
-+# recover.c \
-+# recov_thread.c \
-+# service.c \
-+# wiretest.c \
-+# $(LDLM_COMM_SOURCES)
-+#
-+#ptlrpc_CFLAGS := $(EXTRA_KCFLAGS)
-+#ptlrpc_LDFLAGS := $(EXTRA_KLDFLAGS)
-+#ptlrpc_LDADD := $(EXTRA_KLIBS)
-+#
-+#plist_DATA := Info.plist
-+#
-+#install_data_hook := fix-kext-ownership
-+#
-+#endif # DARWIN
-
- endif # MODULES
-
diff --git a/debian/patches/no-darwin.patch b/debian/patches/no-darwin.patch
new file mode 100755
index 0000000..92d1a55
--- /dev/null
+++ b/debian/patches/no-darwin.patch
@@ -0,0 +1,524 @@
+## no-darwin.dpatch by Goswin von Brederlow <goswin-v-b at web.de>
+## DP: Remove faulty 'if DARWIN' blocks from autoMakefile.am files
+## DP: Remove darwin subdirs from autoMakefile.am files
+
+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)
+
+ 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 \
+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)
+
+ EXTRA_DIST = api.h api-support.h \
+ 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
+
+-if DARWIN
+-
+- macos_PROGRAMS := ksocklnd
+-
+- nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c socklnd_modparams.c socklnd_lib-darwin.c
+-
+- ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
+- ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
+- ksocklnd_LDADD := $(EXTRA_KLIBS)
+-
+- plist_DATA := Info.plist
+- install_data_hook := fix-kext-ownership
++#if DARWIN
++#
++# macos_PROGRAMS := ksocklnd
++#
++# nodist_ksocklnd_SOURCES := socklnd.c socklnd_cb.c socklnd_proto.c socklnd_modparams.c socklnd_lib-darwin.c
++#
++# ksocklnd_CFLAGS := $(EXTRA_KCFLAGS)
++# ksocklnd_LDFLAGS := $(EXTRA_KLDFLAGS)
++# ksocklnd_LDADD := $(EXTRA_KLIBS)
++#
++# plist_DATA := Info.plist
++# install_data_hook := fix-kext-ownership
+
+- EXTRA_DIST := socklnd_lib-darwin.c socklnd_lib-darwin.h $(plist_DATA)
+-endif # DARWIN
++# EXTRA_DIST := socklnd_lib-darwin.c socklnd_lib-darwin.h $(plist_DATA)
++#endif # DARWIN
+
+ install-data-hook: $(install_data_hook)
+
+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)
+
+ if LIBLUSTRE
+ noinst_LIBRARIES= libcfs.a
+@@ -53,25 +53,25 @@
+ modulenet_DATA := libcfs$(KMODEXT)
+ endif
+
+-if DARWIN
+-macos_PROGRAMS := libcfs
+-
+-nodist_libcfs_SOURCES := darwin/darwin-sync.c darwin/darwin-mem.c \
+- darwin/darwin-prim.c darwin/darwin-fs.c darwin/darwin-curproc.c \
+- darwin/darwin-tcpip.c darwin/darwin-utils.c \
+- darwin/darwin-debug.c darwin/darwin-proc.c \
+- darwin/darwin-tracefile.c darwin/darwin-module.c \
+- debug.c module.c tracefile.c nidstrings.c watchdog.c
+-
+-libcfs_CFLAGS := $(EXTRA_KCFLAGS)
+-libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
+-libcfs_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif
++#if DARWIN
++#macos_PROGRAMS := libcfs
++#
++#nodist_libcfs_SOURCES := darwin/darwin-sync.c darwin/darwin-mem.c \
++# darwin/darwin-prim.c darwin/darwin-fs.c darwin/darwin-curproc.c \
++# darwin/darwin-tcpip.c darwin/darwin-utils.c \
++# darwin/darwin-debug.c darwin/darwin-proc.c \
++# darwin/darwin-tracefile.c darwin/darwin-module.c \
++# debug.c module.c tracefile.c nidstrings.c watchdog.c
++#
++#libcfs_CFLAGS := $(EXTRA_KCFLAGS)
++#libcfs_LDFLAGS := $(EXTRA_KLDFLAGS)
++#libcfs_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif
+
+ endif
+
+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
+
+-if DARWIN
+-macos_PROGRAMS := lnet
+-
+-lnet_SOURCES := api-errno.c api-ni.c config.c
+-lnet_SOURCES += lib-me.c lib-msg.c lib-eq.c lib-md.c
+-lnet_SOURCES += lib-move.c module.c lo.c router.c router_proc.c
+-lnet_SOURCES += acceptor.c peer.c
+-
+-lnet_CFLAGS := $(EXTRA_KCFLAGS)
+-lnet_LDFLAGS := $(EXTRA_KLDFLAGS)
+-lnet_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # DARWIN
++#if DARWIN
++#macos_PROGRAMS := lnet
++#
++#lnet_SOURCES := api-errno.c api-ni.c config.c
++#lnet_SOURCES += lib-me.c lib-msg.c lib-eq.c lib-md.c
++#lnet_SOURCES += lib-move.c module.c lo.c router.c router_proc.c
++#lnet_SOURCES += acceptor.c peer.c
++#
++#lnet_CFLAGS := $(EXTRA_KCFLAGS)
++#lnet_LDFLAGS := $(EXTRA_KLDFLAGS)
++#lnet_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # DARWIN
+
+ endif # MODULES
+
+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
+
+-if DARWIN
+-macos_PROGRAMS := lov
++#if DARWIN
++#macos_PROGRAMS := lov
+
+-lov_SOURCES := \
+- lov_log.c \
+- lov_pool.c \
+- lov_obd.c \
+- lov_pack.c \
+- lov_request.c \
+- lov_merge.c \
+- lov_qos.c \
+- lov_offset.c \
+- lov_internal.h
++#lov_SOURCES := \
++# lov_log.c \
++# lov_pool.c \
++# lov_obd.c \
++# lov_pack.c \
++# lov_request.c \
++# lov_merge.c \
++# lov_qos.c \
++# lov_offset.c \
++# lov_internal.h
+
+-lov_CFLAGS := $(EXTRA_KCFLAGS)
+-lov_LDFLAGS := $(EXTRA_KLDFLAGS)
+-lov_LDADD := $(EXTRA_KLIBS)
++#lov_CFLAGS := $(EXTRA_KCFLAGS)
++#lov_LDFLAGS := $(EXTRA_KLDFLAGS)
++#lov_LDADD := $(EXTRA_KLIBS)
+
+-plist_DATA := Info.plist
++#plist_DATA := Info.plist
+
+-install_data_hook := fix-kext-ownership
++#install_data_hook := fix-kext-ownership
+
+-endif # DARWIN
++#endif # DARWIN
+
+ endif # MODULES
+
+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
+
+-if DARWIN
+-
+-macos_PROGRAMS := lvfs
+-
+-lvfs_SOURCES := lvfs_darwin.c
+-
+-lvfs_CFLAGS := $(EXTRA_KCFLAGS)
+-lvfs_LDFLAGS := $(EXTRA_KLDFLAGS)
+-lvfs_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # DARWIN
++#if DARWIN
++#
++#macos_PROGRAMS := lvfs
++#
++#lvfs_SOURCES := lvfs_darwin.c
++#
++#lvfs_CFLAGS := $(EXTRA_KCFLAGS)
++#lvfs_LDFLAGS := $(EXTRA_KLDFLAGS)
++#lvfs_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # DARWIN
+
+ else # MODULES
+
+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)
+
+ if LIBLUSTRE
+
+@@ -25,25 +25,25 @@
+ noinst_DATA = llog_test$(KMODEXT)
+ endif # LINUX
+
+-if DARWIN
+-macos_PROGRAMS := obdclass
+-
+-obdclass_SOURCES := \
+- darwin/darwin-module.c darwin/darwin-sysctl.c \
+- class_obd.c genops.c lprocfs_status.c \
+- lustre_handles.c lustre_peer.c obd_config.c \
+- obdo.c debug.c llog_ioctl.c uuid.c \
+- llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c
+-
+-obdclass_CFLAGS := $(EXTRA_KCFLAGS)
+-obdclass_LDFLAGS := $(EXTRA_KLDFLAGS)
+-obdclass_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # DARWIN
++#if DARWIN
++#macos_PROGRAMS := obdclass
++#
++#obdclass_SOURCES := \
++# darwin/darwin-module.c darwin/darwin-sysctl.c \
++# class_obd.c genops.c lprocfs_status.c \
++# lustre_handles.c lustre_peer.c obd_config.c \
++# obdo.c debug.c llog_ioctl.c uuid.c \
++# llog_swab.c llog_obd.c llog.c llog_cat.c llog_lvfs.c
++#
++#obdclass_CFLAGS := $(EXTRA_KCFLAGS)
++#obdclass_LDFLAGS := $(EXTRA_KLDFLAGS)
++#obdclass_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # DARWIN
+
+ endif # MODULES
+
+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
+
+-if DARWIN
+-macos_PROGRAMS := obdecho
+-obdecho_SOURCES := \
+- lproc_echo.c \
+- echo.c \
+- echo_client.c
+-
+-obdecho_CFLAGS := $(EXTRA_KCFLAGS)
+-obdecho_LDFLAGS := $(EXTRA_KLDFLAGS)
+-obdecho_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # darwin
++#if DARWIN
++#macos_PROGRAMS := obdecho
++#obdecho_SOURCES := \
++# lproc_echo.c \
++# echo.c \
++# echo_client.c
++#
++#obdecho_CFLAGS := $(EXTRA_KCFLAGS)
++#obdecho_LDFLAGS := $(EXTRA_KLDFLAGS)
++#obdecho_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # darwin
+
+ endif # MODULES
+
+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
+
+-if DARWIN
+-macos_PROGRAMS := osc
+-
+-osc_SOURCES := \
+- osc_create.c \
+- osc_request.c
+-
+-osc_CFLAGS := $(EXTRA_KCFLAGS)
+-osc_LDFLAGS := $(EXTRA_KLDFLAGS)
+-osc_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # Darwin
++#if DARWIN
++#macos_PROGRAMS := osc
++#
++#osc_SOURCES := \
++# osc_create.c \
++# osc_request.c
++#
++#osc_CFLAGS := $(EXTRA_KCFLAGS)
++#osc_LDFLAGS := $(EXTRA_KLDFLAGS)
++#osc_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # Darwin
+
+ endif
+
+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
+
+-if DARWIN
+-macos_PROGRAMS := ptlrpc
+-
+-ptlrpc_SOURCES := \
+- ptlrpc_module.c \
+- client.c \
+- connection.c \
+- events.c \
+- import.c \
+- llog_client.c \
+- llog_net.c \
+- llog_server.c \
+- lproc_ptlrpc.c \
+- niobuf.c \
+- pack_generic.c \
+- pers.c \
+- pinger.c \
+- ptlrpcd.c \
+- recover.c \
+- recov_thread.c \
+- service.c \
+- wiretest.c \
+- $(LDLM_COMM_SOURCES)
+-
+-ptlrpc_CFLAGS := $(EXTRA_KCFLAGS)
+-ptlrpc_LDFLAGS := $(EXTRA_KLDFLAGS)
+-ptlrpc_LDADD := $(EXTRA_KLIBS)
+-
+-plist_DATA := Info.plist
+-
+-install_data_hook := fix-kext-ownership
+-
+-endif # DARWIN
++#if DARWIN
++#macos_PROGRAMS := ptlrpc
++#
++#ptlrpc_SOURCES := \
++# ptlrpc_module.c \
++# client.c \
++# connection.c \
++# events.c \
++# import.c \
++# llog_client.c \
++# llog_net.c \
++# llog_server.c \
++# lproc_ptlrpc.c \
++# niobuf.c \
++# pack_generic.c \
++# pers.c \
++# pinger.c \
++# ptlrpcd.c \
++# recover.c \
++# recov_thread.c \
++# service.c \
++# wiretest.c \
++# $(LDLM_COMM_SOURCES)
++#
++#ptlrpc_CFLAGS := $(EXTRA_KCFLAGS)
++#ptlrpc_LDFLAGS := $(EXTRA_KLDFLAGS)
++#ptlrpc_LDADD := $(EXTRA_KLIBS)
++#
++#plist_DATA := Info.plist
++#
++#install_data_hook := fix-kext-ownership
++#
++#endif # DARWIN
+
+ endif # MODULES
+
diff --git a/debian/patches/no-strict-aliasing.dpatch b/debian/patches/no-strict-aliasing.dpatch
deleted file mode 100755
index e82103c..0000000
--- a/debian/patches/no-strict-aliasing.dpatch
+++ /dev/null
@@ -1,23 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no_default_debugging.patch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Build lustre wit -fno-strict-aliasing as it otherwise fails to compile with gcc-4.4
-
- at DPATCH@
-diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre-core.m4
---- lustre~/lustre/autoconf/lustre-core.m4 2010-08-04 12:56:24.000000000 +0200
-+++ lustre/lustre/autoconf/lustre-core.m4 2010-08-04 12:57:31.810494143 +0200
-@@ -2269,9 +2269,9 @@
- AC_DEFUN([LC_CONFIGURE],
- [LC_CONFIG_OBD_BUFFER_SIZE
-
--if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
-- CFLAGS="$CFLAGS -Werror"
--fi
-+#if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
-+# CFLAGS="$CFLAGS -Werror"
-+#fi
-
- # include/liblustre.h
- AC_CHECK_HEADERS([asm/page.h sys/user.h sys/vfs.h stdint.h blkid/blkid.h])
diff --git a/debian/patches/no-strict-aliasing.patch b/debian/patches/no-strict-aliasing.patch
new file mode 100755
index 0000000..450d334
--- /dev/null
+++ b/debian/patches/no-strict-aliasing.patch
@@ -0,0 +1,19 @@
+## no_default_debugging.patch by Patrick Winnertz <winnie at debian.org>
+## DP: Build lustre wit -fno-strict-aliasing as it otherwise fails to compile with gcc-4.4
+
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' lustre~/lustre/autoconf/lustre-core.m4 lustre/lustre/autoconf/lustre-core.m4
+--- lustre~/lustre/autoconf/lustre-core.m4 2010-08-04 12:56:24.000000000 +0200
++++ lustre/lustre/autoconf/lustre-core.m4 2010-08-04 12:57:31.810494143 +0200
+@@ -2269,9 +2269,9 @@
+ AC_DEFUN([LC_CONFIGURE],
+ [LC_CONFIG_OBD_BUFFER_SIZE
+
+-if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
+- CFLAGS="$CFLAGS -Werror"
+-fi
++#if test $target_cpu == "i686" -o $target_cpu == "x86_64"; then
++# CFLAGS="$CFLAGS -Werror"
++#fi
+
+ # include/liblustre.h
+ AC_CHECK_HEADERS([asm/page.h sys/user.h sys/vfs.h stdint.h blkid/blkid.h])
diff --git a/debian/patches/no_default_debugging.dpatch b/debian/patches/no_default_debugging.dpatch
deleted file mode 100755
index f072b26..0000000
--- a/debian/patches/no_default_debugging.dpatch
+++ /dev/null
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## no_default_debugging.patch by Goswin von Brederlow <goswin-v-b at web.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch from Q-Leap Networks
-
- at DPATCH@
-diff -urNad lustre-1.6.5-rc2~/lnet/libcfs/debug.c lustre-1.6.5-rc2/lnet/libcfs/debug.c
---- lustre-1.6.5-rc2~/lnet/libcfs/debug.c 2008-05-09 13:44:34.000000000 +0200
-+++ lustre-1.6.5-rc2/lnet/libcfs/debug.c 2008-05-09 13:46:09.000000000 +0200
-@@ -34,13 +34,13 @@
- static char debug_file_name[1024];
-
- #ifdef __KERNEL__
--unsigned int libcfs_subsystem_debug = ~0;
-+unsigned int libcfs_subsystem_debug = 0;
- CFS_MODULE_PARM(libcfs_subsystem_debug, "i", int, 0644,
- "Lustre kernel debug subsystem mask");
- EXPORT_SYMBOL(libcfs_subsystem_debug);
-
--unsigned int libcfs_debug = (D_EMERG | D_ERROR | D_WARNING | D_CONSOLE |
-- D_NETERROR | D_HA | D_CONFIG | D_IOCTL);
-+unsigned int libcfs_debug = 0;
-+
- CFS_MODULE_PARM(libcfs_debug, "i", int, 0644,
- "Lustre kernel debug mask");
- EXPORT_SYMBOL(libcfs_debug);
diff --git a/debian/patches/no_default_debugging.patch b/debian/patches/no_default_debugging.patch
new file mode 100755
index 0000000..bc2015a
--- /dev/null
+++ b/debian/patches/no_default_debugging.patch
@@ -0,0 +1,23 @@
+## no_default_debugging.patch by Goswin von Brederlow <goswin-v-b at web.de>
+## DP: Patch from Q-Leap Networks
+
+diff -urNad lustre-1.6.5-rc2~/lnet/libcfs/debug.c lustre-1.6.5-rc2/lnet/libcfs/debug.c
+--- lustre-1.6.5-rc2~/lnet/libcfs/debug.c 2008-05-09 13:44:34.000000000 +0200
++++ lustre-1.6.5-rc2/lnet/libcfs/debug.c 2008-05-09 13:46:09.000000000 +0200
+@@ -34,13 +34,13 @@
+ static char debug_file_name[1024];
+
+ #ifdef __KERNEL__
+-unsigned int libcfs_subsystem_debug = ~0;
++unsigned int libcfs_subsystem_debug = 0;
+ CFS_MODULE_PARM(libcfs_subsystem_debug, "i", int, 0644,
+ "Lustre kernel debug subsystem mask");
+ EXPORT_SYMBOL(libcfs_subsystem_debug);
+
+-unsigned int libcfs_debug = (D_EMERG | D_ERROR | D_WARNING | D_CONSOLE |
+- D_NETERROR | D_HA | D_CONFIG | D_IOCTL);
++unsigned int libcfs_debug = 0;
++
+ CFS_MODULE_PARM(libcfs_debug, "i", int, 0644,
+ "Lustre kernel debug mask");
+ EXPORT_SYMBOL(libcfs_debug);
diff --git a/debian/patches/page-size-undef-fixes.dpatch b/debian/patches/page-size-undef-fixes.dpatch
deleted file mode 100755
index 01b7add..0000000
--- a/debian/patches/page-size-undef-fixes.dpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## page-size-undef-fixes.dpatch by <dmlb2000 at gmail.com>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: set PAGE_SHIFT if this macro is undefined
-
- at DPATCH@
---- lustre-1.6.0.1/lnet/include/libcfs/user-prim.h 2007-05-24 07:23:17.000000000 -0700
-+++ lustre-1.6.0.1/lnet/include/libcfs/user-prim.h 2007-05-24 07:24:04.000000000 -0700
-@@ -105,6 +105,12 @@
-
- typedef struct page cfs_page_t;
-
-+#ifndef PAGE_SHIFT
-+#define PAGE_SHIFT 12 /* 4KB page size if not defined */
-+#endif
-+#ifndef PAGE_SIZE
-+#define PAGE_SIZE ((__u64)1 << PAGE_SHIFT)
-+#endif
- #define CFS_PAGE_SIZE PAGE_SIZE
- #define CFS_PAGE_SHIFT PAGE_SHIFT
- #define CFS_PAGE_MASK (~((__u64)CFS_PAGE_SIZE-1))
diff --git a/debian/patches/page-size-undef-fixes.patch b/debian/patches/page-size-undef-fixes.patch
new file mode 100755
index 0000000..63e185d
--- /dev/null
+++ b/debian/patches/page-size-undef-fixes.patch
@@ -0,0 +1,18 @@
+## page-size-undef-fixes.dpatch by <dmlb2000 at gmail.com>
+## DP: set PAGE_SHIFT if this macro is undefined
+
+--- lustre-1.6.0.1/lnet/include/libcfs/user-prim.h 2007-05-24 07:23:17.000000000 -0700
++++ lustre-1.6.0.1/lnet/include/libcfs/user-prim.h 2007-05-24 07:24:04.000000000 -0700
+@@ -105,6 +105,12 @@
+
+ typedef struct page cfs_page_t;
+
++#ifndef PAGE_SHIFT
++#define PAGE_SHIFT 12 /* 4KB page size if not defined */
++#endif
++#ifndef PAGE_SIZE
++#define PAGE_SIZE ((__u64)1 << PAGE_SHIFT)
++#endif
+ #define CFS_PAGE_SIZE PAGE_SIZE
+ #define CFS_PAGE_SHIFT PAGE_SHIFT
+ #define CFS_PAGE_MASK (~((__u64)CFS_PAGE_SIZE-1))
diff --git a/debian/patches/posix_acl.dpatch b/debian/patches/posix_acl.dpatch
deleted file mode 100755
index c837e3b..0000000
--- a/debian/patches/posix_acl.dpatch
+++ /dev/null
@@ -1,62 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## posix_acl.patch by Goswin von Brederlow <goswin-v-b at web.de>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Patch from Q-Leap Networks
-
- at DPATCH@
-diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
---- lustre~/lustre/llite/file.c 2009-03-12 10:33:45.000000000 +0100
-+++ lustre/lustre/llite/file.c 2009-03-12 10:41:51.000000000 +0100
-@@ -45,6 +45,7 @@
- #include <lustre_lite.h>
- #include <linux/pagemap.h>
- #include <linux/file.h>
-+#include <linux/posix_acl.h>
- #include "llite_internal.h"
- #include <lustre/ll_fiemap.h>
-
-diff -urNad lustre~/lustre/llite/xattr.c lustre/lustre/llite/xattr.c
---- lustre~/lustre/llite/xattr.c 2009-03-12 10:27:57.000000000 +0100
-+++ lustre/lustre/llite/xattr.c 2009-03-12 10:40:31.000000000 +0100
-@@ -38,6 +38,7 @@
- #include <linux/sched.h>
- #include <linux/mm.h>
- #include <linux/smp_lock.h>
-+#include <linux/posix_acl_xattr.h>
-
- #define DEBUG_SUBSYSTEM S_LLITE
-
-diff -urNad lustre~/lustre/mdc/mdc_locks.c lustre/lustre/mdc/mdc_locks.c
---- lustre~/lustre/mdc/mdc_locks.c 2009-03-12 10:27:57.000000000 +0100
-+++ lustre/lustre/mdc/mdc_locks.c 2009-03-12 10:40:31.000000000 +0100
-@@ -44,6 +44,7 @@
- # include <linux/pagemap.h>
- # include <linux/miscdevice.h>
- # include <linux/init.h>
-+# include <linux/posix_acl_xattr.h>
- #else
- # include <liblustre.h>
- #endif
-diff -urNad lustre~/lustre/mdc/mdc_request.c lustre/lustre/mdc/mdc_request.c
---- lustre~/lustre/mdc/mdc_request.c 2009-03-12 10:27:57.000000000 +0100
-+++ lustre/lustre/mdc/mdc_request.c 2009-03-12 10:40:31.000000000 +0100
-@@ -44,6 +44,7 @@
- # include <linux/pagemap.h>
- # include <linux/miscdevice.h>
- # include <linux/init.h>
-+# include <linux/posix_acl_xattr.h>
- #else
- # include <liblustre.h>
- #endif
-diff -urNad lustre~/lustre/mds/handler.c lustre/lustre/mds/handler.c
---- lustre~/lustre/mds/handler.c 2009-03-12 10:40:31.000000000 +0100
-+++ lustre/lustre/mds/handler.c 2009-03-12 10:42:18.000000000 +0100
-@@ -52,6 +52,7 @@
- #include <linux/random.h>
- #include <linux/fs.h>
- #include <linux/jbd.h>
-+#include <linux/posix_acl_xattr.h>
- # include <linux/smp_lock.h>
- # include <linux/buffer_head.h>
- # include <linux/workqueue.h>
diff --git a/debian/patches/posix_acl.patch b/debian/patches/posix_acl.patch
new file mode 100755
index 0000000..b1a18a3
--- /dev/null
+++ b/debian/patches/posix_acl.patch
@@ -0,0 +1,58 @@
+## posix_acl.patch by Goswin von Brederlow <goswin-v-b at web.de>
+## DP: Patch from Q-Leap Networks
+
+diff -urNad lustre~/lustre/llite/file.c lustre/lustre/llite/file.c
+--- lustre~/lustre/llite/file.c 2009-03-12 10:33:45.000000000 +0100
++++ lustre/lustre/llite/file.c 2009-03-12 10:41:51.000000000 +0100
+@@ -45,6 +45,7 @@
+ #include <lustre_lite.h>
+ #include <linux/pagemap.h>
+ #include <linux/file.h>
++#include <linux/posix_acl.h>
+ #include "llite_internal.h"
+ #include <lustre/ll_fiemap.h>
+
+diff -urNad lustre~/lustre/llite/xattr.c lustre/lustre/llite/xattr.c
+--- lustre~/lustre/llite/xattr.c 2009-03-12 10:27:57.000000000 +0100
++++ lustre/lustre/llite/xattr.c 2009-03-12 10:40:31.000000000 +0100
+@@ -38,6 +38,7 @@
+ #include <linux/sched.h>
+ #include <linux/mm.h>
+ #include <linux/smp_lock.h>
++#include <linux/posix_acl_xattr.h>
+
+ #define DEBUG_SUBSYSTEM S_LLITE
+
+diff -urNad lustre~/lustre/mdc/mdc_locks.c lustre/lustre/mdc/mdc_locks.c
+--- lustre~/lustre/mdc/mdc_locks.c 2009-03-12 10:27:57.000000000 +0100
++++ lustre/lustre/mdc/mdc_locks.c 2009-03-12 10:40:31.000000000 +0100
+@@ -44,6 +44,7 @@
+ # include <linux/pagemap.h>
+ # include <linux/miscdevice.h>
+ # include <linux/init.h>
++# include <linux/posix_acl_xattr.h>
+ #else
+ # include <liblustre.h>
+ #endif
+diff -urNad lustre~/lustre/mdc/mdc_request.c lustre/lustre/mdc/mdc_request.c
+--- lustre~/lustre/mdc/mdc_request.c 2009-03-12 10:27:57.000000000 +0100
++++ lustre/lustre/mdc/mdc_request.c 2009-03-12 10:40:31.000000000 +0100
+@@ -44,6 +44,7 @@
+ # include <linux/pagemap.h>
+ # include <linux/miscdevice.h>
+ # include <linux/init.h>
++# include <linux/posix_acl_xattr.h>
+ #else
+ # include <liblustre.h>
+ #endif
+diff -urNad lustre~/lustre/mds/handler.c lustre/lustre/mds/handler.c
+--- lustre~/lustre/mds/handler.c 2009-03-12 10:40:31.000000000 +0100
++++ lustre/lustre/mds/handler.c 2009-03-12 10:42:18.000000000 +0100
+@@ -52,6 +52,7 @@
+ #include <linux/random.h>
+ #include <linux/fs.h>
+ #include <linux/jbd.h>
++#include <linux/posix_acl_xattr.h>
+ # include <linux/smp_lock.h>
+ # include <linux/buffer_head.h>
+ # include <linux/workqueue.h>
diff --git a/debian/patches/tex2pdf.dpatch b/debian/patches/tex2pdf.dpatch
deleted file mode 100755
index 4c273ca..0000000
--- a/debian/patches/tex2pdf.dpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: prevend tex2pdf from writing to a location outside the build dir
-
- at DPATCH@
-diff -urNad lustre-1.6.2.obsolete.0.125913187702285~/lustre/doc/tex2pdf lustre-1.6.2.obsolete.0.125913187702285/lustre/doc/tex2pdf
---- lustre-1.6.2~/lustre/doc/tex2pdf 2002-09-17 22:11:35.000000000 +0200
-+++ lustre-1.6.2/lustre/doc/tex2pdf 2007-09-18 11:30:03.000000000 +0200
-@@ -61,9 +61,8 @@
- my $MYHOSTNAME=hostname;
- my $MYNAME=basename $0;
- my $MYUSER=$ENV{'USER'};
--my $USER_HOME=$ENV{'HOME'};
- if (not $MYUSER) { $MYUSER = 'nobody'; }
--if (not $USER_HOME) { $USER_HOME = '/tmp'; }
-+my $USER_HOME = $ENV{'PWD'};
-
- my @TMPFILES=();
- my @TMP_TEX_FILES=();
-@@ -1128,8 +1127,8 @@
- &abort("Illegal value: $value");
- }
- &set_param_value($key, $value);
-- } elsif (defined(&type_enum_array($type))){
-- &set_enum_param($key, $value);
-+# } elsif (defined(&type_enum_array($type))){
-+# &set_enum_param($key, $value);
- } else {
- &set_param_value($key, $value);
- }
diff --git a/debian/patches/tex2pdf.patch b/debian/patches/tex2pdf.patch
new file mode 100755
index 0000000..bb2c7a6
--- /dev/null
+++ b/debian/patches/tex2pdf.patch
@@ -0,0 +1,27 @@
+## DP: prevend tex2pdf from writing to a location outside the build dir
+
+diff -urNad lustre-1.6.2.obsolete.0.125913187702285~/lustre/doc/tex2pdf lustre-1.6.2.obsolete.0.125913187702285/lustre/doc/tex2pdf
+--- lustre-1.6.2~/lustre/doc/tex2pdf 2002-09-17 22:11:35.000000000 +0200
++++ lustre-1.6.2/lustre/doc/tex2pdf 2007-09-18 11:30:03.000000000 +0200
+@@ -61,9 +61,8 @@
+ my $MYHOSTNAME=hostname;
+ my $MYNAME=basename $0;
+ my $MYUSER=$ENV{'USER'};
+-my $USER_HOME=$ENV{'HOME'};
+ if (not $MYUSER) { $MYUSER = 'nobody'; }
+-if (not $USER_HOME) { $USER_HOME = '/tmp'; }
++my $USER_HOME = $ENV{'PWD'};
+
+ my @TMPFILES=();
+ my @TMP_TEX_FILES=();
+@@ -1128,8 +1127,8 @@
+ &abort("Illegal value: $value");
+ }
+ &set_param_value($key, $value);
+- } elsif (defined(&type_enum_array($type))){
+- &set_enum_param($key, $value);
++# } elsif (defined(&type_enum_array($type))){
++# &set_enum_param($key, $value);
+ } else {
+ &set_param_value($key, $value);
+ }
diff --git a/debian/patches/use_bash_instead_of_sh.dpatch b/debian/patches/use_bash_instead_of_sh.dpatch
deleted file mode 100755
index 5bd01e7..0000000
--- a/debian/patches/use_bash_instead_of_sh.dpatch
+++ /dev/null
@@ -1,26 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## use_bash_instead_of_sh.dpatch by Patrick Winnertz <winnie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: This script uses functions not available on plain sh shell, therefore
-## DP: using /bin/bash instead
-
- at DPATCH@
-diff -urNad lustre~/lustre/tests/acl/make-tree lustre/lustre/tests/acl/make-tree
---- lustre~/lustre/tests/acl/make-tree 2005-06-21 00:18:48.000000000 +0200
-+++ lustre/lustre/tests/acl/make-tree 2008-10-10 09:32:09.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
-
- # reduce LEVELS from 3 => 2 by CFS
- LEVELS=2 ; [ -z "$1" ] || LEVELS=$1
-diff -urNad lustre~/lustre/tests/insanity.sh lustre/lustre/tests/insanity.sh
---- lustre~/lustre/tests/insanity.sh 2008-01-11 13:30:26.000000000 +0100
-+++ lustre/lustre/tests/insanity.sh 2008-10-10 09:32:19.000000000 +0200
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- # Test multiple failures, AKA Test 17
-
- set -e
diff --git a/debian/patches/use_bash_instead_of_sh.patch b/debian/patches/use_bash_instead_of_sh.patch
new file mode 100755
index 0000000..8cafa64
--- /dev/null
+++ b/debian/patches/use_bash_instead_of_sh.patch
@@ -0,0 +1,22 @@
+## use_bash_instead_of_sh.dpatch by Patrick Winnertz <winnie at debian.org>
+## DP: This script uses functions not available on plain sh shell, therefore
+## DP: using /bin/bash instead
+
+diff -urNad lustre~/lustre/tests/acl/make-tree lustre/lustre/tests/acl/make-tree
+--- lustre~/lustre/tests/acl/make-tree 2005-06-21 00:18:48.000000000 +0200
++++ lustre/lustre/tests/acl/make-tree 2008-10-10 09:32:09.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+
+ # reduce LEVELS from 3 => 2 by CFS
+ LEVELS=2 ; [ -z "$1" ] || LEVELS=$1
+diff -urNad lustre~/lustre/tests/insanity.sh lustre/lustre/tests/insanity.sh
+--- lustre~/lustre/tests/insanity.sh 2008-01-11 13:30:26.000000000 +0100
++++ lustre/lustre/tests/insanity.sh 2008-10-10 09:32:19.000000000 +0200
+@@ -1,4 +1,4 @@
+-#!/bin/sh
++#!/bin/bash
+ # Test multiple failures, AKA Test 17
+
+ set -e
diff --git a/debian/rules b/debian/rules
index 9d24020..de3b54d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -321,7 +321,6 @@ binary-modules: prep-deb-files
clean:
dh_testdir
dh_testroot
- dpatch deapply-all
rm -rf debian/substvars debian/*.bak debian/*~ *~ *-stamp
rm -rf $(BUILDDIR)
rm -rf debian/patched
@@ -329,11 +328,9 @@ clean:
patch: patch-stamp
patch-stamp:
- dpatch apply-all
touch $@
unpatch:
- dpatch deapply-all
rm -rf debian/patched patch-stamp
.PHONY: binary-arch clean source diff binary binary-indep binary-arch install configure
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
Lustre Debian Packaging
More information about the Pkg-lustre-svn-commit
mailing list