[Pkg-ofed-commits] r635 - in /branches/ofed-1.5lenny/qlvnictools/trunk: ./ debia...

gmpc-guest at alioth.debian.org gmpc-guest at alioth.debian.org
Wed Feb 10 17:13:15 UTC 2010


Author: gmpc-guest
Date: Wed Feb 10 17:13:14 2010
New Revision: 635

URL: http://svn.debian.org/wsvn/pkg-ofed/?sc=1&rev=635
Log:
New upstream release (OFED 1.5)

Added:
    branches/ofed-1.5lenny/qlvnictools/trunk/COPYING
      - copied unchanged from r634, branches/ofed-1.5lenny/qlvnictools/branches/upstream/current/COPYING
    branches/ofed-1.5lenny/qlvnictools/trunk/qlgc_vnic_daemon/COPYING
      - copied unchanged from r634, branches/ofed-1.5lenny/qlvnictools/branches/upstream/current/qlgc_vnic_daemon/COPYING
Modified:
    branches/ofed-1.5lenny/qlvnictools/trunk/debian/changelog
    branches/ofed-1.5lenny/qlvnictools/trunk/ibvexdmtools/configure
    branches/ofed-1.5lenny/qlvnictools/trunk/ibvexdmtools/src/ib-vexdm.c
    branches/ofed-1.5lenny/qlvnictools/trunk/qlgc_vnic
    branches/ofed-1.5lenny/qlvnictools/trunk/qlgc_vnic_daemon/src/qlgc_vnic_dyn_update_daemon.h
    branches/ofed-1.5lenny/qlvnictools/trunk/qlvnictools.spec

Modified: branches/ofed-1.5lenny/qlvnictools/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/qlvnictools/trunk/debian/changelog?rev=635&op=diff
==============================================================================
--- branches/ofed-1.5lenny/qlvnictools/trunk/debian/changelog (original)
+++ branches/ofed-1.5lenny/qlvnictools/trunk/debian/changelog Wed Feb 10 17:13:14 2010
@@ -1,3 +1,9 @@
+qlvnictools (0.0.1-0.1.ge27eef7-1) UNRELEASED; urgency=low
+
+  * New upstream release (OFED 1.5)
+
+ -- Guy Coates <gmpc at sanger.ac.uk>  Wed, 10 Feb 2010 17:12:29 +0000
+
 qlvnictools (0.0.1-1) unstable; urgency=low
 
   * Initial release (Closes: #539831)

Modified: branches/ofed-1.5lenny/qlvnictools/trunk/ibvexdmtools/configure
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/qlvnictools/trunk/ibvexdmtools/configure?rev=635&op=diff
==============================================================================
--- branches/ofed-1.5lenny/qlvnictools/trunk/ibvexdmtools/configure (original)
+++ branches/ofed-1.5lenny/qlvnictools/trunk/ibvexdmtools/configure Wed Feb 10 17:13:14 2010
@@ -953,7 +953,7 @@
     else
       echo "$as_me: WARNING: no configuration information is in $ac_dir" >&2
     fi
-    cd "$ac_popdir"
+    cd $ac_popdir
   done
 fi
 
@@ -2320,7 +2320,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2378,7 +2379,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2494,7 +2496,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2548,7 +2551,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2593,7 +2597,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2637,7 +2642,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -2892,7 +2898,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3215,7 +3222,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3385,7 +3393,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3456,7 +3465,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3605,7 +3615,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -3762,7 +3773,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4029,7 +4041,8 @@
   cat conftest.err >&5
   echo "$as_me:$LINENO: \$? = $ac_status" >&5
   (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"			 || test ! -s conftest.err'
+	 { ac_try='test -z "$ac_c_werror_flag"
+			 || test ! -s conftest.err'
   { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
@@ -4908,6 +4921,11 @@
   *) ac_INSTALL=$ac_top_builddir$INSTALL ;;
   esac
 
+  if test x"$ac_file" != x-; then
+    { echo "$as_me:$LINENO: creating $ac_file" >&5
+echo "$as_me: creating $ac_file" >&6;}
+    rm -f "$ac_file"
+  fi
   # Let's still pretend it is `configure' which instantiates (i.e., don't
   # use $as_me), people would be surprised to read:
   #    /* config.h.  Generated by config.status.  */
@@ -4946,12 +4964,6 @@
 	 fi;;
       esac
     done` || { (exit 1); exit 1; }
-
-  if test x"$ac_file" != x-; then
-    { echo "$as_me:$LINENO: creating $ac_file" >&5
-echo "$as_me: creating $ac_file" >&6;}
-    rm -f "$ac_file"
-  fi
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF
   sed "$ac_vpsub

Modified: branches/ofed-1.5lenny/qlvnictools/trunk/ibvexdmtools/src/ib-vexdm.c
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/qlvnictools/trunk/ibvexdmtools/src/ib-vexdm.c?rev=635&op=diff
==============================================================================
--- branches/ofed-1.5lenny/qlvnictools/trunk/ibvexdmtools/src/ib-vexdm.c (original)
+++ branches/ofed-1.5lenny/qlvnictools/trunk/ibvexdmtools/src/ib-vexdm.c Wed Feb 10 17:13:14 2010
@@ -51,6 +51,7 @@
 #include <byteswap.h>
 #include <errno.h>
 #include <getopt.h>
+#include <infiniband/arch.h>
 #include <infiniband/umad.h>
 
 #include "ib-vexdm.h"

Modified: branches/ofed-1.5lenny/qlvnictools/trunk/qlgc_vnic
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/qlvnictools/trunk/qlgc_vnic?rev=635&op=diff
==============================================================================
--- branches/ofed-1.5lenny/qlvnictools/trunk/qlgc_vnic (original)
+++ branches/ofed-1.5lenny/qlvnictools/trunk/qlgc_vnic Wed Feb 10 17:13:14 2010
@@ -5,10 +5,9 @@
 ### BEGIN INIT INFO
 # Provides:       qlgc_vnic
 # Required-Start: openibd
-# Required-Stop:
+# Required-Stop:  openibd
 # Default-Start:  2 3 5
-# Default-Stop: 0 1 2 6
-# Description:  Start/Stop for QLogic VNIC
+# Default-Stop:	  0 1 2 6
 ### END INIT INFO
 #
 # Start, Stop, Restart the QLogic VNIC service
@@ -216,18 +215,23 @@
 
 load_module()
 {
+	MODPROBE="modprobe"
+
+	if modprobe -c  | grep -q '^allow_unsupported_modules  *0'; then
+		MODPROBE="modprobe --allow-unsupported-modules"
+	fi
 	
 	if lsmod | grep "^$*" >/dev/null 2>&1 ; then
 		return 0;
 	fi		
 	# try to silently load
-	modprobe $* >/dev/null 2>&1
+	$MODPROBE $* >/dev/null 2>&1
 	res=$?
 	
 	if [ $res != 0 ]
 	then
 		# if fails, try again and log failures
-		modprobe $* 2>&1|logger -s -p kern.err
+		$MODPROBE $* 2>&1|logger -s -p kern.err
 		res=$?
 	fi
 	return $res

Modified: branches/ofed-1.5lenny/qlvnictools/trunk/qlgc_vnic_daemon/src/qlgc_vnic_dyn_update_daemon.h
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/qlvnictools/trunk/qlgc_vnic_daemon/src/qlgc_vnic_dyn_update_daemon.h?rev=635&op=diff
==============================================================================
--- branches/ofed-1.5lenny/qlvnictools/trunk/qlgc_vnic_daemon/src/qlgc_vnic_dyn_update_daemon.h (original)
+++ branches/ofed-1.5lenny/qlvnictools/trunk/qlgc_vnic_daemon/src/qlgc_vnic_dyn_update_daemon.h Wed Feb 10 17:13:14 2010
@@ -1,3 +1,35 @@
+/*
+ * Copyright (c) 2007 QLogic, Inc.  All rights reserved.
+ *
+ * This software is available to you under a choice of one of two
+ * licenses.  You may choose to be licensed under the terms of the GNU
+ * General Public License (GPL) Version 2, available from the file
+ * COPYING in the main directory of this source tree, or the
+ * OpenIB.org BSD license below:
+ *
+ *     Redistribution and use in source and binary forms, with or
+ *     without modification, are permitted provided that the following
+ *     conditions are met:
+ *
+ *      - Redistributions of source code must retain the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer.
+ *
+ *      - Redistributions in binary form must reproduce the above
+ *        copyright notice, this list of conditions and the following
+ *        disclaimer in the documentation and/or other materials
+ *        provided with the distribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
+ * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
+ * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include <sys/types.h>

Modified: branches/ofed-1.5lenny/qlvnictools/trunk/qlvnictools.spec
URL: http://svn.debian.org/wsvn/pkg-ofed/branches/ofed-1.5lenny/qlvnictools/trunk/qlvnictools.spec?rev=635&op=diff
==============================================================================
--- branches/ofed-1.5lenny/qlvnictools/trunk/qlvnictools.spec (original)
+++ branches/ofed-1.5lenny/qlvnictools/trunk/qlvnictools.spec Wed Feb 10 17:13:14 2010
@@ -11,12 +11,12 @@
 
 Name:           qlvnictools
 Version: 0.0.1
-Release: 1.ofed1.4
+Release: 0.1.ge27eef7
 Summary:        VNIC ULP service
 Group:          System/Console
-License:        GPL v2 only
+License:        GPLv2 or BSD
 URL:            http://www.openfabrics.org
-Source: http://www.openfabrics.org/downloads/qlvnictools-0.0.1.tar.gz
+Source: http://www.openfabrics.org/downloads/qlvnictools-0.0.1-0.1.ge27eef7.tar.gz
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 Requires:       ibvexdmtools
 




More information about the Pkg-ofed-commits mailing list