Author: winnie
Date: Thu May 15 10:08:50 2008
New Revision: 474

URL: http://svn.debian.org/wsvn/pkg-lustre/?sc=1&rev=474
Log:
Add things for 1.6.5rc2

Modified:
    trunk/debian/changelog
    trunk/debian/lustre-utils.docs
    trunk/debian/patches/00list
    trunk/debian/patches/ldiskfs-detect-2.6.20-2.6.22.dpatch
    trunk/debian/patches/no-m64.dpatch
    trunk/debian/patches/no_default_debugging.dpatch
    trunk/debian/patches/remove-set_tunables.dpatch
    trunk/debian/rules

Modified: trunk/debian/changelog
URL: 
http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/changelog?rev=474&op=diff
==============================================================================
--- trunk/debian/changelog (original)
+++ trunk/debian/changelog Thu May 15 10:08:50 2008
@@ -1,3 +1,9 @@
+lustre (1.6.5~rc2-1) UNRELEASED; urgency=low
+
+  * New upstream Version 
+
+ -- Patrick Winnertz <[EMAIL PROTECTED]>  Fri, 09 May 2008 12:19:06 +0200
+
 lustre (1.6.4.3-2) UNRELEASED; urgency=low
 
   * Changed lustre version in rules.. forgot that in last upload

Modified: trunk/debian/lustre-utils.docs
URL: 
http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/lustre-utils.docs?rev=474&op=diff
==============================================================================
--- trunk/debian/lustre-utils.docs (original)
+++ trunk/debian/lustre-utils.docs Thu May 15 10:08:50 2008
@@ -1,5 +1,1 @@
 README
-debian/build/lustre/doc/lconf.pdf
-debian/build/lustre/doc/lctl.pdf
-debian/build/lustre/doc/lfs.pdf
-debian/build/lustre/doc/lmc.pdf

Modified: trunk/debian/patches/00list
URL: 
http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/00list?rev=474&op=diff
==============================================================================
--- trunk/debian/patches/00list (original)
+++ trunk/debian/patches/00list Thu May 15 10:08:50 2008
@@ -3,31 +3,21 @@
 inode-no-i_blksize-2.6.20.dpatch
 posix_acl.dpatch
 2.6.21-mds-orphan_link.dpatch
-2.6.22_ib.dpatch
 ldiskfs-detect-2.6.20-2.6.22.dpatch
 no_default_debugging.dpatch
 no-m64.dpatch
-autogen.sh.dpatch
+#autogen.sh.dpatch # not needed for rc2 since autogen.sh is there
 no-darwin.dpatch
 remove-set_tunables.dpatch
 libsysio.dpatch
-#bug10600-smaller-qunit-quota.dpatch
 bug12769-ql-fix.dpatch
 
 # Debian patches
-bug14619-broken-qunit-allock.dpatch
 bash_completion.dpatch
 lustre_manpage.dpatch
 tex2pdf.dpatch
 lustre_config.dpatch
 fix-2.6.15-versioncheck.dpatch
 bug13852-quota_includes.dpatch
-bug6334-prevent_multiple_mounts.dpatch
 fix-lustre-manpage.dpatch
 enable-quota.dpatch
-
-#4 TB Issue:
-bug13904-fix1.dpatch
-bug13904-fix2.dpatch
-bug13904-fix3.dpatch
-bug15036-fix1.dpatch

Modified: trunk/debian/patches/ldiskfs-detect-2.6.20-2.6.22.dpatch
URL: 
http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/ldiskfs-detect-2.6.20-2.6.22.dpatch?rev=474&op=diff
==============================================================================
--- trunk/debian/patches/ldiskfs-detect-2.6.20-2.6.22.dpatch (original)
+++ trunk/debian/patches/ldiskfs-detect-2.6.20-2.6.22.dpatch Thu May 15 
10:08:50 2008
@@ -5,22 +5,23 @@
 ## DP: Patch from Q-Leap Networks modified by Patrick winnertz <[EMAIL 
PROTECTED]>
 
 @DPATCH@
-diff -urNad lustre-1.6.2~/ldiskfs/configure.ac 
lustre-1.6.2/ldiskfs/configure.ac
---- ./ldiskfs/configure.ac.orig        2007-09-14 14:05:54.000000000 +0200
-+++ ./ldiskfs/configure.ac     2007-09-14 14:06:11.000000000 +0200
-@@ -74,7 +74,15 @@
- 2.6.16*) LDISKFS_SERIES="2.6-sles10.series";;
- 2.6.18-*el5*) LDISKFS_SERIES="2.6-rhel5.series";;
- 2.6.18-*prep*) LDISKFS_SERIES="2.6-rhel5.series";;
--2.6.18*) LDISKFS_SERIES="2.6.18-vanilla.series";;
-+2.6.18*) if test -e $LINUX_OBJ/version.Debian; then
-+           LDISKFS_SERIES="2.6.18-debian.series"
-+         else
-+           LDISKFS_SERIES="2.6.18-vanilla.series"
-+         fi;;
-+2.6.20*) LDISKFS_SERIES="2.6.20-vanilla.series";;
-+2.6.21*) LDISKFS_SERIES="2.6.21-vanilla.series";;
-+2.6.22*) LDISKFS_SERIES="2.6.22-vanilla.series";;
+diff -urNad lustre-1.6.5~rc2~/ldiskfs/configure.ac 
lustre-1.6.5~rc2/ldiskfs/configure.ac
+--- lustre-1.6.5~rc2~/ldiskfs/configure.ac     2008-04-24 10:28:16.000000000 
+0200
++++ lustre-1.6.5~rc2/ldiskfs/configure.ac      2008-05-09 14:21:18.000000000 
+0200
+@@ -95,11 +95,15 @@
+ 2.6.18*)
+       if test x$RHEL_KENEL = xyes; then
+               LDISKFS_SERIES="2.6-rhel5.series"
+-      else
+-              LDISKFS_SERIES="2.6.18-vanilla.series"
++      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.23*) LDISKFS_SERIES="2.6.23-vanilla.series";;
  *) AC_MSG_WARN([Unknown kernel version $LINUXRELEASE, fix 
ldiskfs/configure.ac])
  esac

Modified: trunk/debian/patches/no-m64.dpatch
URL: 
http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/no-m64.dpatch?rev=474&op=diff
==============================================================================
--- trunk/debian/patches/no-m64.dpatch (original)
+++ trunk/debian/patches/no-m64.dpatch Thu May 15 10:08:50 2008
@@ -7,10 +7,10 @@
 ## DP:        for modules if needed but not for userspace
 
 @DPATCH@
-diff -urNad lustre-1.6.2~/build/autoconf/lustre-build.m4 
lustre-1.6.2/build/autoconf/lustre-build.m4
---- lustre-1.6.2~/build/autoconf/lustre-build.m4       2007-09-27 
10:09:59.000000000 +0200
-+++ lustre-1.6.2/build/autoconf/lustre-build.m4        2007-09-27 
10:10:00.600970872 +0200
-@@ -469,21 +469,21 @@
+diff -urNad lustre-1.6.5-rc2~/build/autoconf/lustre-build.m4 
lustre-1.6.5-rc2/build/autoconf/lustre-build.m4
+--- lustre-1.6.5-rc2~/build/autoconf/lustre-build.m4   2008-05-09 
13:55:51.000000000 +0200
++++ lustre-1.6.5-rc2/build/autoconf/lustre-build.m4    2008-05-09 
13:55:59.000000000 +0200
+@@ -543,21 +543,21 @@
  fi
  
  # FIXME
@@ -47,43 +47,3 @@
  
  CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include 
-I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
  
-diff -urNad lustre-1.6.2~/ldiskfs/build/autoconf/lustre-build.m4 
lustre-1.6.2/ldiskfs/build/autoconf/lustre-build.m4
---- lustre-1.6.2~/ldiskfs/build/autoconf/lustre-build.m4       2007-09-27 
10:09:59.000000000 +0200
-+++ lustre-1.6.2/ldiskfs/build/autoconf/lustre-build.m4        2007-09-27 
10:10:00.600970872 +0200
-@@ -469,21 +469,21 @@
- fi
- 
- # FIXME
--AC_CHECK_DECL([__i386__], [], [
--
--if test x$enable_bgl != xyes; then
--AC_MSG_CHECKING([if $CC accepts -m64])
--CC_save="$CC"
--CC="$CC -m64"
--AC_TRY_COMPILE([],[],[
--      AC_MSG_RESULT([yes])
--],[
--      AC_MSG_RESULT([no])
--      CC="$CC_save"
--])
--fi
--
--])
-+#AC_CHECK_DECL([__i386__], [], [
-+#
-+#if test x$enable_bgl != xyes; then
-+#AC_MSG_CHECKING([if $CC accepts -m64])
-+#CC_save="$CC"
-+#CC="$CC -m64"
-+#AC_TRY_COMPILE([],[],[
-+#     AC_MSG_RESULT([yes])
-+#],[
-+#     AC_MSG_RESULT([no])
-+#     CC="$CC_save"
-+#])
-+#fi
-+#
-+#])
- 
- CPPFLAGS="-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include 
-I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
- 

Modified: trunk/debian/patches/no_default_debugging.dpatch
URL: 
http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/no_default_debugging.dpatch?rev=474&op=diff
==============================================================================
--- trunk/debian/patches/no_default_debugging.dpatch (original)
+++ trunk/debian/patches/no_default_debugging.dpatch Thu May 15 10:08:50 2008
@@ -5,21 +5,23 @@
 ## DP: Patch from Q-Leap Networks
 
 @DPATCH@
-diff -r e758c39e2b13 lnet/libcfs/debug.c
---- a/lnet/libcfs/debug.c      Thu Aug 16 13:52:42 2007 +0200
-+++ b/lnet/libcfs/debug.c      Thu Aug 16 13:53:58 2007 +0200
-@@ -33,11 +33,11 @@ static char debug_file_name[1024];
+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);
- 
- unsigned int libcfs_printk;

Modified: trunk/debian/patches/remove-set_tunables.dpatch
URL: 
http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/patches/remove-set_tunables.dpatch?rev=474&op=diff
==============================================================================
--- trunk/debian/patches/remove-set_tunables.dpatch (original)
+++ trunk/debian/patches/remove-set_tunables.dpatch Thu May 15 10:08:50 2008
@@ -5,10 +5,10 @@
 ## DP: removed set tunables from mount.lustre since it doesn't work under etch
 
 @DPATCH@
-diff -urNad lustre-1.6.3~/lustre/utils/mount_lustre.c 
lustre-1.6.3/lustre/utils/mount_lustre.c
---- lustre-1.6.3~/lustre/utils/mount_lustre.c  2007-09-26 23:47:59.000000000 
+0200
-+++ lustre-1.6.3/lustre/utils/mount_lustre.c   2007-10-31 13:55:23.000000000 
+0100
-@@ -275,7 +275,10 @@
+diff -urNad lustre-1.6.5-rc2~/lustre/utils/mount_lustre.c 
lustre-1.6.5-rc2/lustre/utils/mount_lustre.c
+--- lustre-1.6.5-rc2~/lustre/utils/mount_lustre.c      2008-05-09 
14:01:54.000000000 +0200
++++ lustre-1.6.5-rc2/lustre/utils/mount_lustre.c       2008-05-09 
14:03:38.000000000 +0200
+@@ -286,7 +286,10 @@
  
  /* This is to tune the kernel for good SCSI performance.
   * For that we set the value of /sys/block/{dev}/queue/max_sectors_kb
@@ -20,25 +20,29 @@
  int set_tunables(char *source, int src_len)
  {
          glob_t glob_info;
-@@ -320,7 +323,7 @@
-         /* The name of the device say 'X' specified in /dev/X may not
+@@ -340,10 +343,10 @@
+         if (rc != ENOENT)
+                 return rc;
+ 
+-        /* The name of the device say 'X' specified in /dev/X may not
++        * The name of the device say 'X' specified in /dev/X may not
           * match any entry under /sys/block/. In that case we need to
           * match the major/minor number to find the entry under
 -         * sys/block corresponding to /dev/X */
 +         * sys/block corresponding to /dev/X *
-         dev = source + src_len - 1;
-         while (dev > source) {
+         dev = real_path + src_len - 1;
+         while (dev > real_path) {
                  if (isdigit(*dev))
-@@ -388,7 +391,7 @@
-                                 path, strerror(errno));
-         }
+@@ -415,7 +418,7 @@
+ out:
+         globfree(&glob_info);
          return rc;
 -}
 +} */
  
  int main(int argc, char *const argv[])
  {
-@@ -520,10 +523,10 @@
+@@ -547,10 +550,10 @@
                  printf("mounting device %s at %s, flags=%#x options=%s\n",
                         source, target, flags, optcopy);
  

Modified: trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lustre/trunk/debian/rules?rev=474&op=diff
==============================================================================
--- trunk/debian/rules (original)
+++ trunk/debian/rules Thu May 15 10:08:50 2008
@@ -85,9 +85,9 @@
        dh_testdir
        $(MAKE) -C $(BUILDDIR)
        # The .pdf's don't get automatically built, so
-       HOME=$(TOP_DIR)/debian/build/lustre/doc $(MAKE) -C 
$(BUILDDIR)/lustre/doc lconf.pdf  lctl.pdf  lfs.pdf  lmc.pdf
+       #HOME=$(TOP_DIR)/debian/build/lustre/doc $(MAKE) -C 
$(BUILDDIR)/lustre/doc lconf.pdf  lctl.pdf  lfs.pdf  lmc.pdf
        ## FIXME: $(BUILDDIR) isn't used
-       mv lustre/doc/lconf.pdf lustre/doc/lctl.pdf lustre/doc/lfs.pdf 
lustre/doc/lmc.pdf $(BUILDDIR)/lustre/doc
+       # mv lustre/doc/lconf.pdf lustre/doc/lctl.pdf lustre/doc/lfs.pdf 
lustre/doc/lmc.pdf $(BUILDDIR)/lustre/doc
        $(MAKE) -C $(BUILDDIR) DESTDIR=$(TOP_DIR)/debian/tmp install
        touch $@
 


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

Reply via email to