equal
deleted
inserted
replaced
|
1 # This patch was developed in-house. Since it is Solaris-specific, |
|
2 # it is not suitable for upstream. |
|
3 # |
1 diff -r -u /tmp/ibutils-1.5.7/config/osm.m4 ibutils-1.5.7/config/osm.m4 |
4 diff -r -u /tmp/ibutils-1.5.7/config/osm.m4 ibutils-1.5.7/config/osm.m4 |
2 --- /tmp/ibutils-1.5.7/config/osm.m4 Thu Feb 18 03:31:34 2010 |
5 --- /tmp/ibutils-1.5.7/config/osm.m4 Thu Feb 18 03:31:34 2010 |
3 +++ ibutils-1.5.7/config/osm.m4 Thu Feb 24 16:51:16 2011 |
6 +++ ibutils-1.5.7/config/osm.m4 Thu Feb 24 16:51:16 2011 |
4 @@ -179,7 +179,7 @@ |
7 @@ -179,7 +179,7 @@ |
5 osm_debug_flags= |
8 osm_debug_flags= |
208 install_sh_PROGRAM = $(install_sh) -c |
211 install_sh_PROGRAM = $(install_sh) -c |
209 install_sh_SCRIPT = $(install_sh) -c |
212 install_sh_SCRIPT = $(install_sh) -c |
210 INSTALL_HEADER = $(INSTALL_DATA) |
213 INSTALL_HEADER = $(INSTALL_DATA) |
211 diff -r -u /tmp/ibutils-1.5.7/ibdiag/src/ibdebug.tcl ibutils-1.5.7/ibdiag/src/ibdebug.tcl |
214 diff -r -u /tmp/ibutils-1.5.7/ibdiag/src/ibdebug.tcl ibutils-1.5.7/ibdiag/src/ibdebug.tcl |
212 --- /tmp/ibutils-1.5.7/ibdiag/src/ibdebug.tcl Tue Mar 8 03:08:02 2011 |
215 --- /tmp/ibutils-1.5.7/ibdiag/src/ibdebug.tcl Tue Mar 8 03:08:02 2011 |
213 +++ ibutils-1.5.7/ibdiag/src/ibdebug.tcl Thu Jun 27 22:46:57 2013 |
216 +++ ibutils-1.5.7/ibdiag/src/ibdebug.tcl Wed Apr 16 17:45:12 2014 |
214 @@ -352,13 +352,16 @@ |
217 @@ -352,13 +352,16 @@ |
215 if {[file exists $ibisOutDir/$ibisLogFile] && (![file writable $ibisOutDir/$ibisLogFile])} { |
218 if {[file exists $ibisOutDir/$ibisLogFile] && (![file writable $ibisOutDir/$ibisLogFile])} { |
216 set ibisLogFile $ibisLogFile.[pid] |
219 set ibisLogFile $ibisLogFile.[pid] |
217 } |
220 } |
218 + |
221 + |
251 set FileID [InitializeOutputFile $G(var:tool.name).db] |
254 set FileID [InitializeOutputFile $G(var:tool.name).db] |
252 |
255 |
253 foreach {array_name data} {G data* Neighbor *} { |
256 foreach {array_name data} {G data* Neighbor *} { |
254 diff -r -u /tmp/ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl |
257 diff -r -u /tmp/ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl |
255 --- /tmp/ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl Thu Oct 7 07:29:56 2010 |
258 --- /tmp/ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl Thu Oct 7 07:29:56 2010 |
256 +++ ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl Wed Jun 19 07:43:17 2013 |
259 +++ ibutils-1.5.7/ibdiag/src/ibdebug_if.tcl Wed Apr 16 17:45:12 2014 |
257 @@ -675,6 +675,16 @@ |
260 @@ -675,6 +675,16 @@ |
258 } |
261 } |
259 |
262 |
260 ## Command line check - Test5.0: log file |
263 ## Command line check - Test5.0: log file |
261 + |
264 + |
945 +#include <infiniband/ofa_solaris.h> |
948 +#include <infiniband/ofa_solaris.h> |
946 +#endif |
949 +#endif |
947 |
950 |
948 #define CR_CLASS 0x09 |
951 #define CR_CLASS 0x09 |
949 #define CR_ATTR_50 0x50 |
952 #define CR_ATTR_50 0x50 |
|
953 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibis_base.h ibutils-1.5.7/ibis/src/ibis_base.h |
|
954 --- /tmp/ibutils-1.5.7/ibis/src/ibis_base.h Wed Feb 24 02:09:25 2010 |
|
955 +++ ibutils-1.5.7/ibis/src/ibis_base.h Wed Apr 9 10:54:26 2014 |
|
956 @@ -64,7 +64,7 @@ |
|
957 #define IBIS_FILE_PATH_MAX PATH_MAX |
|
958 #endif |
|
959 |
|
960 -#define MAX_LOCAL_IBPORTS 32 |
|
961 +#define MAX_LOCAL_IBPORTS MAX_PORTS |
|
962 #define DISP_HANDLE_MAX 32 |
|
963 |
|
964 END_C_DECLS |
950 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibis_wrap.c ibutils-1.5.7/ibis/src/ibis_wrap.c |
965 diff -r -u /tmp/ibutils-1.5.7/ibis/src/ibis_wrap.c ibutils-1.5.7/ibis/src/ibis_wrap.c |
951 --- /tmp/ibutils-1.5.7/ibis/src/ibis_wrap.c Mon Nov 1 16:03:44 2010 |
966 --- /tmp/ibutils-1.5.7/ibis/src/ibis_wrap.c Mon Nov 1 16:03:44 2010 |
952 +++ ibutils-1.5.7/ibis/src/ibis_wrap.c Mon Jun 6 15:35:52 2011 |
967 +++ ibutils-1.5.7/ibis/src/ibis_wrap.c Mon Jun 6 15:35:52 2011 |
953 @@ -2722,18 +2722,18 @@ |
968 @@ -2722,18 +2722,18 @@ |
954 typedef ib_mad_notice_attr_t smNotice; |
969 typedef ib_mad_notice_attr_t smNotice; |
1364 else |
1379 else |
1365 with_osm=disabled |
1380 with_osm=disabled |
1366 OSM_CLFAGS=disabled |
1381 OSM_CLFAGS=disabled |
1367 diff -r -u /tmp/ibutils-1.5.7/Makefile.in ibutils-1.5.7/Makefile.in |
1382 diff -r -u /tmp/ibutils-1.5.7/Makefile.in ibutils-1.5.7/Makefile.in |
1368 --- /tmp/ibutils-1.5.7/Makefile.in Tue Mar 8 03:09:29 2011 |
1383 --- /tmp/ibutils-1.5.7/Makefile.in Tue Mar 8 03:09:29 2011 |
1369 +++ ibutils-1.5.7/Makefile.in Thu Mar 10 18:33:24 2011 |
1384 +++ ibutils-1.5.7/Makefile.in Thu Dec 12 15:36:52 2013 |
1370 @@ -54,7 +54,7 @@ |
1385 @@ -54,7 +54,7 @@ |
1371 pkglibdir = $(libdir)/@PACKAGE@ |
1386 pkglibdir = $(libdir)/@PACKAGE@ |
1372 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
1387 pkglibexecdir = $(libexecdir)/@PACKAGE@ |
1373 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
1388 am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd |
1374 -install_sh_DATA = $(install_sh) -c -m 644 |
1389 -install_sh_DATA = $(install_sh) -c -m 644 |
1376 install_sh_PROGRAM = $(install_sh) -c |
1391 install_sh_PROGRAM = $(install_sh) -c |
1377 install_sh_SCRIPT = $(install_sh) -c |
1392 install_sh_SCRIPT = $(install_sh) -c |
1378 INSTALL_HEADER = $(INSTALL_DATA) |
1393 INSTALL_HEADER = $(INSTALL_DATA) |
1379 diff -r -u /tmp/ibutils-1.5.7/configure ibutils-1.5.7/configure |
1394 diff -r -u /tmp/ibutils-1.5.7/configure ibutils-1.5.7/configure |
1380 --- /tmp/ibutils-1.5.7/configure Tue Mar 8 03:09:29 2011 |
1395 --- /tmp/ibutils-1.5.7/configure Tue Mar 8 03:09:29 2011 |
1381 +++ ibutils-1.5.7/configure Thu Mar 10 18:33:24 2011 |
1396 +++ ibutils-1.5.7/configure Thu Dec 12 16:51:11 2013 |
1382 @@ -1824,7 +1824,7 @@ |
1397 @@ -1824,7 +1824,7 @@ |
1383 |
1398 |
1384 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' |
1399 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}' |
1385 |
1400 |
1386 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |
1401 -test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' |