The following commit has been merged in the master branch:
commit db703d78ab69dc61142316504a52c2331c767e5d
Author: Marco Nelles <marco.nel...@credativ.de>
Date:   Tue Jun 5 09:21:52 2012 +0200

    Adapted no-default-debugging.patch

diff --git a/debian/patches/no-default-debugging.patch 
b/debian/patches/no-default-debugging.patch
new file mode 100644
index 0000000..196b7c6
--- /dev/null
+++ b/debian/patches/no-default-debugging.patch
@@ -0,0 +1,30 @@
+diff --git a/libcfs/libcfs/debug.c b/libcfs/libcfs/debug.c
+index 5dc8312..b976517 100644
+--- a/libcfs/libcfs/debug.c
++++ b/libcfs/libcfs/debug.c
+@@ -52,13 +52,13 @@
+ 
+ static char debug_file_name[1024];
+ 
+-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_CANTMASK |
+-                             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);
+@@ -404,7 +404,7 @@ int libcfs_debug_init(unsigned long bufsize)
+ 
+         if (libcfs_debug_file_path != NULL) {
+                 memset(libcfs_debug_file_path_arr, 0, PATH_MAX);
+-                strncpy(libcfs_debug_file_path_arr, 
++                strncpy(libcfs_debug_file_path_arr,
+                         libcfs_debug_file_path, PATH_MAX-1);
+         }
+ 
diff --git a/debian/patches/no_default_debugging.patch 
b/debian/patches/no_default_debugging.patch
deleted file mode 100644
index 23bb126..0000000
--- a/debian/patches/no_default_debugging.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-## no_default_debugging.patch by Goswin von Brederlow <goswin-...@web.de>
-## DP: Patch from Q-Leap Networks
-
-Index: lustre/lnet/libcfs/debug.c
-===================================================================
---- lustre.orig/lnet/libcfs/debug.c    2010-12-07 16:54:33.125545003 +0100
-+++ lustre/lnet/libcfs/debug.c 2010-12-07 16:59:14.421545003 +0100
-@@ -52,13 +52,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/series b/debian/patches/series
index 723f159..df6fbc4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 posix-acl.patch
-#no_default_debugging.patch
+no-default-debugging.patch
 no-darwin.patch
 #libsysio.patch
 #bug12769-ql-fix.patch

-- 
Lustre Debian Packaging 

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

Reply via email to