Sync from SUSE:SLFO:Main ibutils revision 46965a86526f25983caf777f8217846d
This commit is contained in:
commit
f01b46d56d
23
.gitattributes
vendored
Normal file
23
.gitattributes
vendored
Normal file
@ -0,0 +1,23 @@
|
|||||||
|
## Default LFS
|
||||||
|
*.7z filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bsp filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.bz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gem filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.gz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.jar filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.lzma filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.obscpio filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.oxt filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.pdf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.png filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.rpm filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tbz2 filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.tgz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.ttf filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.txz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.whl filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.xz filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zip filter=lfs diff=lfs merge=lfs -text
|
||||||
|
*.zst filter=lfs diff=lfs merge=lfs -text
|
||||||
4
_multibuild
Normal file
4
_multibuild
Normal file
@ -0,0 +1,4 @@
|
|||||||
|
<multibuild>
|
||||||
|
<package>ui</package>
|
||||||
|
</multibuild>
|
||||||
|
|
||||||
46
ibis-drop-multiple-definition-of-IbisObj.patch
Normal file
46
ibis-drop-multiple-definition-of-IbisObj.patch
Normal file
@ -0,0 +1,46 @@
|
|||||||
|
commit 62998956cb17538f925f76ce6c4193f415f7cc01
|
||||||
|
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
||||||
|
Date: Sun Jun 7 14:56:55 2020 +0200
|
||||||
|
|
||||||
|
ibis drop multiple definition of IbisObj
|
||||||
|
|
||||||
|
Drop multiple global definition of IbisObj that breaks with GCC10
|
||||||
|
|
||||||
|
Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
||||||
|
|
||||||
|
diff --git ibis/src/ibis.i ibis/src/ibis.i
|
||||||
|
index 28a0912dd848..e66d84e7bb80 100644
|
||||||
|
--- ibis/src/ibis.i
|
||||||
|
+++ ibis/src/ibis.i
|
||||||
|
@@ -180,7 +180,6 @@ ibisp_is_debug(void)
|
||||||
|
|
||||||
|
%{
|
||||||
|
/* globals */
|
||||||
|
- ibis_t IbisObj;
|
||||||
|
static ibis_opt_t *ibis_opt_p;
|
||||||
|
ibis_opt_t IbisOpts;
|
||||||
|
|
||||||
|
diff --git ibis/src/ibis_wrap.c ibis/src/ibis_wrap.c
|
||||||
|
index ee9760127577..7efadea896ab 100644
|
||||||
|
--- ibis/src/ibis_wrap.c
|
||||||
|
+++ ibis/src/ibis_wrap.c
|
||||||
|
@@ -3004,7 +3004,6 @@ typedef struct {
|
||||||
|
|
||||||
|
|
||||||
|
/* globals */
|
||||||
|
- ibis_t IbisObj;
|
||||||
|
static ibis_opt_t *ibis_opt_p;
|
||||||
|
ibis_opt_t IbisOpts;
|
||||||
|
|
||||||
|
diff --git ibis/src/ibissh_wrap.cpp ibis/src/ibissh_wrap.cpp
|
||||||
|
index 917904fe382a..2f69c4018e71 100644
|
||||||
|
--- ibis/src/ibissh_wrap.cpp
|
||||||
|
+++ ibis/src/ibissh_wrap.cpp
|
||||||
|
@@ -3004,7 +3004,6 @@ typedef struct {
|
||||||
|
|
||||||
|
|
||||||
|
/* globals */
|
||||||
|
- ibis_t IbisObj;
|
||||||
|
static ibis_opt_t *ibis_opt_p;
|
||||||
|
ibis_opt_t IbisOpts;
|
||||||
|
|
||||||
47
ibutils-1.2-retval.patch
Normal file
47
ibutils-1.2-retval.patch
Normal file
@ -0,0 +1,47 @@
|
|||||||
|
Index: ibdm/ibdm/LinkCover.cpp
|
||||||
|
===================================================================
|
||||||
|
--- ibdm/ibdm/LinkCover.cpp.orig 2010-02-24 11:09:24.000000000 +0100
|
||||||
|
+++ ibdm/ibdm/LinkCover.cpp 2012-09-11 14:15:24.543496998 +0200
|
||||||
|
@@ -270,7 +270,7 @@ cleanupFdbForwardPortLidTables(
|
||||||
|
short int *outPortUsed = (*I).second;
|
||||||
|
free(outPortUsed);
|
||||||
|
}
|
||||||
|
-
|
||||||
|
+ return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Linear program does not interest me now...
|
||||||
|
@@ -543,6 +543,7 @@ cleanUpNodeMarkings(map_pnode_p_sint &sw
|
||||||
|
outPortUsed[pIdx] = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
+ return (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
//////////////////////////////////////////////////////////////////////////////
|
||||||
|
Index: ibdm/ibdm/TopoMatch.cpp
|
||||||
|
===================================================================
|
||||||
|
--- ibdm/ibdm/TopoMatch.cpp.orig 2010-11-02 00:03:44.000000000 +0100
|
||||||
|
+++ ibdm/ibdm/TopoMatch.cpp 2012-09-11 14:16:48.679485155 +0200
|
||||||
|
@@ -676,6 +676,8 @@ TopoMatchSpecNodesByAdjacentNode(IBFabri
|
||||||
|
for( list < IBNode *>::iterator nI = unMatchedWithAdjacentMatched.begin();
|
||||||
|
nI != unMatchedWithAdjacentMatched.end(); nI++)
|
||||||
|
numMatched += TopoMatchNodeByAdjacentMatched(*nI);
|
||||||
|
+
|
||||||
|
+ return numMatched;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Index: ibdm/ibdm/CredLoops.cpp
|
||||||
|
===================================================================
|
||||||
|
--- ibdm/ibdm/CredLoops.cpp.orig 2010-11-02 00:03:44.000000000 +0100
|
||||||
|
+++ ibdm/ibdm/CredLoops.cpp 2012-09-11 14:15:24.544496974 +0200
|
||||||
|
@@ -484,7 +484,7 @@ CrdLoopPrepare(IBFabric *p_fabric)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Cleanup the data model
|
||||||
|
-int
|
||||||
|
+void
|
||||||
|
CrdLoopCleanup(IBFabric *p_fabric)
|
||||||
|
{
|
||||||
|
unsigned int lidStep = 1 << p_fabric->lmc;
|
||||||
BIN
ibutils-1.5.7-0.2.gbd7e502.tar.gz
(Stored with Git LFS)
Normal file
BIN
ibutils-1.5.7-0.2.gbd7e502.tar.gz
(Stored with Git LFS)
Normal file
Binary file not shown.
206
ibutils-autotools.patch
Normal file
206
ibutils-autotools.patch
Normal file
@ -0,0 +1,206 @@
|
|||||||
|
---
|
||||||
|
Makefile.am | 2 +-
|
||||||
|
config/swig.m4 | 4 ++--
|
||||||
|
ibdiag/Makefile.am | 4 ++--
|
||||||
|
ibdiag/src/Makefile.am | 2 ++
|
||||||
|
ibdm/Makefile.am | 2 +-
|
||||||
|
ibdm/config/swig.m4 | 4 ++--
|
||||||
|
ibdm/src/Makefile.am | 2 ++
|
||||||
|
ibis/Makefile.am | 2 +-
|
||||||
|
ibis/config/swig.m4 | 4 ++--
|
||||||
|
ibis/configure.in | 7 ++++---
|
||||||
|
ibmgtsim/Makefile.am | 2 +-
|
||||||
|
ibmgtsim/config/swig.m4 | 4 ++--
|
||||||
|
12 files changed, 22 insertions(+), 17 deletions(-)
|
||||||
|
|
||||||
|
Index: Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- Makefile.am.orig 2011-01-06 08:25:51.000000000 +0100
|
||||||
|
+++ Makefile.am 2013-08-28 17:45:28.024940672 +0200
|
||||||
|
@@ -42,7 +42,7 @@ DIST_SUBDIRS = ibis ibdm ibdi
|
||||||
|
|
||||||
|
# this will control the update of the files in order
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
|
||||||
|
-
|
||||||
|
+ACLOCAL_AMFLAGS = -I config
|
||||||
|
ACLOCAL = aclocal -I $(ac_aux_dir)
|
||||||
|
|
||||||
|
EXTRA_DIST = ibutils.spec.in ibmgtsim
|
||||||
|
Index: config/swig.m4
|
||||||
|
===================================================================
|
||||||
|
--- config/swig.m4.orig 2008-06-15 16:37:31.000000000 +0200
|
||||||
|
+++ config/swig.m4 2013-08-28 17:45:28.025940648 +0200
|
||||||
|
@@ -85,9 +85,9 @@ AC_DEFUN([MLX_PROG_SWIG],[
|
||||||
|
dnl AC_MSG_INFO([SWIG executable is '$SWIG'])
|
||||||
|
SWIG_LIB=`$SWIG -swiglib`
|
||||||
|
dnl AC_MSG_INFO([SWIG runtime library directory is '$SWIG_LIB'])
|
||||||
|
- AM_CONDITIONAL(HAS_SWIG,[test 1])
|
||||||
|
+ AM_CONDITIONAL([HAS_SWIG],[test 1])
|
||||||
|
else
|
||||||
|
- AM_CONDITIONAL(HAS_SWIG,[test 0])
|
||||||
|
+ AM_CONDITIONAL([HAS_SWIG],[test 0])
|
||||||
|
fi
|
||||||
|
AC_SUBST([SWIG_LIB])
|
||||||
|
])
|
||||||
|
Index: ibdiag/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- ibdiag/Makefile.am.orig 2010-02-24 11:09:24.000000000 +0100
|
||||||
|
+++ ibdiag/Makefile.am 2013-08-28 17:46:44.805098752 +0200
|
||||||
|
@@ -37,5 +37,5 @@ SUBDIRS = src doc
|
||||||
|
|
||||||
|
# this will control the update of the files in order
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
|
||||||
|
-
|
||||||
|
-ACLOCAL = aclocal -I $(ac_aux_dir)
|
||||||
|
+ACLOCAL_AMFLAGS = -I config
|
||||||
|
+ACLOCAL = aclocal -I $(ac_aux_dir)
|
||||||
|
Index: ibdiag/src/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- ibdiag/src/Makefile.am.orig 2010-10-07 16:28:56.000000000 +0200
|
||||||
|
+++ ibdiag/src/Makefile.am 2013-08-28 17:47:40.052772485 +0200
|
||||||
|
@@ -30,6 +30,8 @@
|
||||||
|
# SOFTWARE.
|
||||||
|
#--
|
||||||
|
|
||||||
|
+ACLOCAL_AMFLAGS = -I config
|
||||||
|
+
|
||||||
|
bin_SCRIPTS = ibdiagnet ibdiagpath ibdiagui git_version.tcl
|
||||||
|
EXTRA_DIST = ibdebug_if.tcl ibdebug.tcl \
|
||||||
|
ibdiagnet.in ibdiagnet.pkg ibdiagnet.tcl \
|
||||||
|
Index: ibdm/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- ibdm/Makefile.am.orig 2010-11-02 00:03:44.000000000 +0100
|
||||||
|
+++ ibdm/Makefile.am 2013-08-28 17:47:54.269431082 +0200
|
||||||
|
@@ -37,7 +37,7 @@ SUBDIRS = ibdm src Clusters ibnl doc s
|
||||||
|
|
||||||
|
# this will control the update of the files in order
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
|
||||||
|
-
|
||||||
|
+ACLOCAL_AMFLAGS = -I config
|
||||||
|
ACLOCAL = aclocal -I $(ac_aux_dir)
|
||||||
|
|
||||||
|
# Support cleanup of swig wrappers
|
||||||
|
Index: ibdm/config/swig.m4
|
||||||
|
===================================================================
|
||||||
|
--- ibdm/config/swig.m4.orig 2010-10-07 10:11:24.000000000 +0200
|
||||||
|
+++ ibdm/config/swig.m4 2013-08-28 17:45:28.025940648 +0200
|
||||||
|
@@ -85,9 +85,9 @@ AC_DEFUN([MLX_PROG_SWIG],[
|
||||||
|
dnl AC_MSG_INFO([SWIG executable is '$SWIG'])
|
||||||
|
SWIG_LIB=`$SWIG -swiglib`
|
||||||
|
dnl AC_MSG_INFO([SWIG runtime library directory is '$SWIG_LIB'])
|
||||||
|
- AM_CONDITIONAL(HAS_SWIG,[test 1])
|
||||||
|
+ AM_CONDITIONAL([HAS_SWIG],[test 1])
|
||||||
|
else
|
||||||
|
- AM_CONDITIONAL(HAS_SWIG,[test 0])
|
||||||
|
+ AM_CONDITIONAL([HAS_SWIG],[test 0])
|
||||||
|
fi
|
||||||
|
AC_SUBST([SWIG_LIB])
|
||||||
|
])
|
||||||
|
Index: ibdm/src/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- ibdm/src/Makefile.am.orig 2010-10-07 16:29:56.000000000 +0200
|
||||||
|
+++ ibdm/src/Makefile.am 2013-08-28 17:48:18.459850057 +0200
|
||||||
|
@@ -35,6 +35,8 @@
|
||||||
|
# MAINTAINERCLEANFILES = Makefile.in common.h stamp-common
|
||||||
|
|
||||||
|
# INCLUDES = -I$(top_builddir) -I$(top_srcdir) $(TCL_CPPFLAGS)
|
||||||
|
+ACLOCAL_AMFLAGS = -I config
|
||||||
|
+
|
||||||
|
pkginclude_HEADERS = ibsysapi.h
|
||||||
|
|
||||||
|
AM_CPPFLAGS = -I$(top_srcdir)/ibdm
|
||||||
|
Index: ibis/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- ibis/Makefile.am.orig 2010-02-24 11:09:25.000000000 +0100
|
||||||
|
+++ ibis/Makefile.am 2013-08-28 17:49:02.859783267 +0200
|
||||||
|
@@ -37,7 +37,7 @@ SUBDIRS = src tests doc
|
||||||
|
|
||||||
|
# this will control the update of the files in order
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
|
||||||
|
-
|
||||||
|
+ACLOCAL_AMFLAGS = -I config
|
||||||
|
ACLOCAL = aclocal -I $(ac_aux_dir)
|
||||||
|
|
||||||
|
# Support cleanup of swig wrappers
|
||||||
|
Index: ibis/config/swig.m4
|
||||||
|
===================================================================
|
||||||
|
--- ibis/config/swig.m4.orig 2010-10-07 10:11:24.000000000 +0200
|
||||||
|
+++ ibis/config/swig.m4 2013-08-28 17:45:28.026940624 +0200
|
||||||
|
@@ -85,9 +85,9 @@ AC_DEFUN([MLX_PROG_SWIG],[
|
||||||
|
dnl AC_MSG_INFO([SWIG executable is '$SWIG'])
|
||||||
|
SWIG_LIB=`$SWIG -swiglib`
|
||||||
|
dnl AC_MSG_INFO([SWIG runtime library directory is '$SWIG_LIB'])
|
||||||
|
- AM_CONDITIONAL(HAS_SWIG,[test 1])
|
||||||
|
+ AM_CONDITIONAL([HAS_SWIG],[test 1])
|
||||||
|
else
|
||||||
|
- AM_CONDITIONAL(HAS_SWIG,[test 0])
|
||||||
|
+ AM_CONDITIONAL([HAS_SWIG],[test 0])
|
||||||
|
fi
|
||||||
|
AC_SUBST([SWIG_LIB])
|
||||||
|
])
|
||||||
|
Index: ibis/configure.in
|
||||||
|
===================================================================
|
||||||
|
--- ibis/configure.in.orig 2011-03-08 12:08:02.000000000 +0100
|
||||||
|
+++ ibis/configure.in 2013-08-28 17:45:28.026940624 +0200
|
||||||
|
@@ -57,6 +57,7 @@ AC_PROG_MAKE_SET
|
||||||
|
dnl Checks for programs.
|
||||||
|
AC_PROG_INSTALL
|
||||||
|
AC_PROG_LN_S
|
||||||
|
+AM_PROG_CC_C_O
|
||||||
|
MLX_PROG_SWIG(1.1.5, eq)
|
||||||
|
|
||||||
|
dnl We will use libtool for making ...
|
||||||
|
@@ -66,7 +67,7 @@ AC_PROG_LIBTOOL
|
||||||
|
|
||||||
|
dnl For making dist we need not check any lib dependency
|
||||||
|
AC_ARG_ENABLE(libcheck,
|
||||||
|
-[ --enable-libcheck Enable Dependency Checking],
|
||||||
|
+ AS_HELP_STRING([--enable-libcheck], [Enable Dependency Checking]),
|
||||||
|
[case "${enableval}" in
|
||||||
|
yes) libcheck=true ;;
|
||||||
|
no) libcheck=false ;;
|
||||||
|
@@ -95,13 +96,13 @@ AC_CHECK_FUNCS([strchr strstr strtol str
|
||||||
|
|
||||||
|
dnl Define an input config option to control debug compile
|
||||||
|
AC_ARG_ENABLE(debug,
|
||||||
|
-[ --enable-debug Turn on debugging],
|
||||||
|
+ AS_HELP_STRING([--enable-debug], [Turn on debugging]),
|
||||||
|
[case "${enableval}" in
|
||||||
|
yes) debug=true ;;
|
||||||
|
no) debug=false ;;
|
||||||
|
*) AC_MSG_ERROR(bad value ${enableval} for --enable-debug) ;;
|
||||||
|
esac],[debug=false])
|
||||||
|
-AM_CONDITIONAL(DEBUG, test x$debug = xtrue)
|
||||||
|
+AM_CONDITIONAL([DEBUG], [test x$debug = xtrue])
|
||||||
|
|
||||||
|
dnl Define an input config option to allow ibis know where
|
||||||
|
dnl the OSM is installed. This should point to one directory above
|
||||||
|
Index: ibmgtsim/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- ibmgtsim/Makefile.am.orig 2010-02-24 11:09:26.000000000 +0100
|
||||||
|
+++ ibmgtsim/Makefile.am 2013-08-28 17:49:56.563492330 +0200
|
||||||
|
@@ -37,7 +37,7 @@ SUBDIRS = src utils tests doc
|
||||||
|
|
||||||
|
# this will control the update of the files in order
|
||||||
|
MAINTAINERCLEANFILES = Makefile.in aclocal.m4 configure config-h.in
|
||||||
|
-
|
||||||
|
+ACLOCAL_AMFLAGS = -I config
|
||||||
|
ACLOCAL = aclocal -I $(ac_aux_dir)
|
||||||
|
|
||||||
|
# Support cleanup of swig wrappers
|
||||||
|
Index: ibmgtsim/config/swig.m4
|
||||||
|
===================================================================
|
||||||
|
--- ibmgtsim/config/swig.m4.orig 2010-10-07 10:11:25.000000000 +0200
|
||||||
|
+++ ibmgtsim/config/swig.m4 2013-08-28 17:45:28.026940624 +0200
|
||||||
|
@@ -85,9 +85,9 @@ AC_DEFUN([MLX_PROG_SWIG],[
|
||||||
|
dnl AC_MSG_INFO([SWIG executable is '$SWIG'])
|
||||||
|
SWIG_LIB=`$SWIG -swiglib`
|
||||||
|
dnl AC_MSG_INFO([SWIG runtime library directory is '$SWIG_LIB'])
|
||||||
|
- AM_CONDITIONAL(HAS_SWIG,[test 1])
|
||||||
|
+ AM_CONDITIONAL([HAS_SWIG],[test 1])
|
||||||
|
else
|
||||||
|
- AM_CONDITIONAL(HAS_SWIG,[test 0])
|
||||||
|
+ AM_CONDITIONAL([HAS_SWIG],[test 0])
|
||||||
|
fi
|
||||||
|
AC_SUBST([SWIG_LIB])
|
||||||
|
])
|
||||||
111
ibutils-diagui.patch
Normal file
111
ibutils-diagui.patch
Normal file
@ -0,0 +1,111 @@
|
|||||||
|
diff --git ibdiag/configure.in ibdiag/configure.in
|
||||||
|
index 0ddf85d..f436939 100644
|
||||||
|
--- ibdiag/configure.in
|
||||||
|
+++ ibdiag/configure.in
|
||||||
|
@@ -61,13 +61,26 @@ AC_ARG_ENABLE(libcheck,
|
||||||
|
*) AC_MSG_ERROR(bad value ${enableval} for --enable-libcheck) ;;
|
||||||
|
esac],[libcheck=true])
|
||||||
|
|
||||||
|
+AC_ARG_ENABLE(ibdiagui,
|
||||||
|
+[ --enable-ibdiagui Build ibdiagui],
|
||||||
|
+[case "${enableval}" in
|
||||||
|
+ yes) ibdiagui=true ;;
|
||||||
|
+ no) ibdiagui=false ;;
|
||||||
|
+ *) AC_MSG_ERROR(bad value ${enableval} for --enable-ibdiagui) ;;
|
||||||
|
+esac],[ibdiagui=true])
|
||||||
|
+AM_CONDITIONAL([BUILD_IBDIAGUI], [test "x$ibdiagui" != xfalse])
|
||||||
|
+
|
||||||
|
if test $libcheck = true; then
|
||||||
|
dnl Checks for libraries.
|
||||||
|
CHECK_IBIS_EXEC_DIR
|
||||||
|
CHECK_IBDM_TCLLIB
|
||||||
|
+
|
||||||
|
+dnl Check for UI libs if ibdiagui is being built
|
||||||
|
+if test "x$ibdiagui" = "xtrue"; then
|
||||||
|
SET_TK_LIBS
|
||||||
|
SET_GRAPHVIZ_LIBS
|
||||||
|
fi
|
||||||
|
+fi
|
||||||
|
|
||||||
|
dnl Create the following Makefiles
|
||||||
|
AC_OUTPUT(Makefile src/Makefile doc/Makefile)
|
||||||
|
diff --git ibdiag/doc/Makefile.am ibdiag/doc/Makefile.am
|
||||||
|
index b64c568..129f184 100644
|
||||||
|
--- ibdiag/doc/Makefile.am
|
||||||
|
+++ ibdiag/doc/Makefile.am
|
||||||
|
@@ -30,8 +30,13 @@
|
||||||
|
# SOFTWARE.
|
||||||
|
#--
|
||||||
|
|
||||||
|
-man_MANS = ibdiagnet.1 ibdiagpath.1 ibdiagui.1
|
||||||
|
-EXTRA_DIST = ibdiagnet.pod ibdiagpath.pod ibdiagui.pod ibdiag_pod2man
|
||||||
|
+man_MANS = ibdiagnet.1 ibdiagpath.1
|
||||||
|
+EXTRA_DIST = ibdiagnet.pod ibdiagpath.pod ibdiag_pod2man
|
||||||
|
+
|
||||||
|
+if BUILD_IBDIAGUI
|
||||||
|
+man_MANS += ibdiagui.1
|
||||||
|
+EXTRA_DIST += ibdiagui.pod
|
||||||
|
+endif
|
||||||
|
|
||||||
|
ibdiagnet.1: ibdiagnet.pod
|
||||||
|
$(srcdir)/ibdiag_pod2man $(srcdir)/ibdiagnet.pod ibdiagnet.1
|
||||||
|
@@ -39,5 +44,7 @@ ibdiagnet.1: ibdiagnet.pod
|
||||||
|
ibdiagpath.1: ibdiagpath.pod
|
||||||
|
$(srcdir)/ibdiag_pod2man $(srcdir)/ibdiagpath.pod ibdiagpath.1
|
||||||
|
|
||||||
|
+if BUILD_IBDIAGUI
|
||||||
|
ibdiagui.1: ibdiagui.pod
|
||||||
|
$(srcdir)/ibdiag_pod2man $(srcdir)/ibdiagui.pod ibdiagui.1
|
||||||
|
+endif
|
||||||
|
diff --git ibdiag/src/Makefile.am ibdiag/src/Makefile.am
|
||||||
|
index c33e9f0..1233b96 100644
|
||||||
|
--- ibdiag/src/Makefile.am
|
||||||
|
+++ ibdiag/src/Makefile.am
|
||||||
|
@@ -32,11 +32,16 @@
|
||||||
|
|
||||||
|
ACLOCAL_AMFLAGS = -I config
|
||||||
|
|
||||||
|
-bin_SCRIPTS = ibdiagnet ibdiagpath ibdiagui git_version.tcl
|
||||||
|
+bin_SCRIPTS = ibdiagnet ibdiagpath git_version.tcl
|
||||||
|
EXTRA_DIST = ibdebug_if.tcl ibdebug.tcl \
|
||||||
|
ibdiagnet.in ibdiagnet.pkg ibdiagnet.tcl \
|
||||||
|
ibdiagpath.in ibdiagpath.pkg ibdiagpath.tcl \
|
||||||
|
- ibdiagui.in ibdiagui.pkg ibdiagui.tcl git_version.tcl
|
||||||
|
+ git_version.tcl
|
||||||
|
+
|
||||||
|
+if BUILD_IBDIAGUI
|
||||||
|
+bin_SCRIPTS += ibdiagui
|
||||||
|
+EXTRA_DIST += ibdiagui.in ibdiagui.pkg ibdiagui.tcl
|
||||||
|
+endif
|
||||||
|
|
||||||
|
GIT=$(shell which git)
|
||||||
|
|
||||||
|
@@ -73,13 +78,15 @@ ibdiagpath: ibdiagpath.in
|
||||||
|
-e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \
|
||||||
|
-e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagpath.in > ibdiagpath
|
||||||
|
|
||||||
|
-ibdiagui: ibdiagui.in
|
||||||
|
+if BUILD_IBDIAGUI
|
||||||
|
+ ibdiagui: ibdiagui.in
|
||||||
|
sed -e 's=%ibdiag_libdir%='$(DESTDIR)$(libdir)'=' \
|
||||||
|
-e 's=%with_ibdm_lib%='$(with_ibdm_lib)'=' \
|
||||||
|
-e 's=%with_tk_lib%='$(with_tk_lib)'=' \
|
||||||
|
-e 's=%with_graphviz_lib%='$(with_graphviz_lib)'=' \
|
||||||
|
-e 's=%with_ibis_bindir%='$(DESTDIR)$(bindir)'=' \
|
||||||
|
-e 's=%with_ibis%='$(with_ibis)'=' $(srcdir)/ibdiagui.in > ibdiagui
|
||||||
|
+endif
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -f ibdiagui ibdiagnet ibdiagpath
|
||||||
|
@@ -100,9 +107,11 @@ install-exec-am: install-binSCRIPTS
|
||||||
|
cp $(srcdir)/ibdebug_if.tcl $(PATH_LIB_DIR)/ibdebug_if.tcl
|
||||||
|
cp $(srcdir)/ibdiagpath.tcl $(PATH_LIB_DIR)/ibdiagpath.tcl
|
||||||
|
cp $(srcdir)/git_version.tcl $(PATH_LIB_DIR)/git_version.tcl
|
||||||
|
+if BUILD_IBDIAGUI
|
||||||
|
mkdir -p $(UI_LIB_DIR)
|
||||||
|
cp $(srcdir)/ibdiagui.pkg $(UI_LIB_DIR)/pkgIndex.tcl
|
||||||
|
cp $(srcdir)/ibdebug.tcl $(UI_LIB_DIR)/ibdebug.tcl
|
||||||
|
cp $(srcdir)/ibdebug_if.tcl $(UI_LIB_DIR)/ibdebug_if.tcl
|
||||||
|
cp $(srcdir)/ibdiagui.tcl $(UI_LIB_DIR)/ibdiagui.tcl
|
||||||
|
cp $(srcdir)/git_version.tcl $(UI_LIB_DIR)/git_version.tcl
|
||||||
|
+endif
|
||||||
22
ibutils-fix-build-dependency.patch
Normal file
22
ibutils-fix-build-dependency.patch
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
commit 27cdf54f89952229ba533f4c7184c4e29c14e4c6
|
||||||
|
Author: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
||||||
|
Date: Tue Aug 21 21:40:16 2018 +0200
|
||||||
|
|
||||||
|
ibutils fix build dependency
|
||||||
|
|
||||||
|
Building with -j1 fails as ibis is built before libibiscom.a
|
||||||
|
|
||||||
|
Signed-off-by: Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
||||||
|
|
||||||
|
diff --git ibis/src/Makefile.am ibis/src/Makefile.am
|
||||||
|
index 9e1bfa21a278..87064954e4ea 100644
|
||||||
|
--- ibis/src/Makefile.am
|
||||||
|
+++ ibis/src/Makefile.am
|
||||||
|
@@ -76,6 +76,7 @@ ibis_SOURCES = ibissh_wrap.cpp
|
||||||
|
|
||||||
|
# note the order of the libraries does matter as we static link
|
||||||
|
ibis_LDADD = -L. -libiscom $(OSM_LDFLAGS) $(TCL_LIBS)
|
||||||
|
+ibis_DEPENDENCIES = libibiscom.a
|
||||||
|
|
||||||
|
|
||||||
|
# SWIG FILES:
|
||||||
13
ibutils-ibis-PIE.patch
Normal file
13
ibutils-ibis-PIE.patch
Normal file
@ -0,0 +1,13 @@
|
|||||||
|
Index: ibutils-1.5.7/ibis/src/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- ibutils-1.5.7.orig/ibis/src/Makefile.am
|
||||||
|
+++ ibutils-1.5.7/ibis/src/Makefile.am
|
||||||
|
@@ -77,7 +77,7 @@ ibis_SOURCES = ibissh_wrap.cpp
|
||||||
|
# note the order of the libraries does matter as we static link
|
||||||
|
ibis_LDADD = -L. -libiscom $(OSM_LDFLAGS) $(TCL_LIBS)
|
||||||
|
ibis_DEPENDENCIES = libibiscom.a
|
||||||
|
-
|
||||||
|
+ibis_LDFLAGS = -pie
|
||||||
|
|
||||||
|
# SWIG FILES:
|
||||||
|
SWIG_IFC_FILES= $(srcdir)/ibbbm.i \
|
||||||
20
ibutils-no_special_ldflags_for_ibdmsh.patch
Normal file
20
ibutils-no_special_ldflags_for_ibdmsh.patch
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
From: Philipp Thomas <pth@suse.de>
|
||||||
|
Date: 2014-07-18 12:19:55+02:00
|
||||||
|
Subject: Do not lin statically; remove rpath
|
||||||
|
|
||||||
|
---
|
||||||
|
ibdm/ibdm/Makefile.am | 1 -
|
||||||
|
1 file changed, 1 deletion(-)
|
||||||
|
|
||||||
|
Index: ibdm/ibdm/Makefile.am
|
||||||
|
===================================================================
|
||||||
|
--- ibdm/ibdm/Makefile.am.orig 2014-07-18 12:17:48.546804401 +0200
|
||||||
|
+++ ibdm/ibdm/Makefile.am 2014-07-18 12:18:55.873962696 +0200
|
||||||
|
@@ -85,7 +85,6 @@ libibdm_la_LDFLAGS = -Wl,-rpath -Wl,$(TC
|
||||||
|
bin_PROGRAMS = ibdmsh
|
||||||
|
ibdmsh_SOURCES = ibdmsh_wrap.cpp
|
||||||
|
ibdmsh_LDADD = -libdmcom $(TCL_LIBS)
|
||||||
|
-ibdmsh_LDFLAGS = -static -Wl,-rpath -Wl,$(TCL_PREFIX)/lib
|
||||||
|
ibdmsh_DEPENDENCIES=$(lib_LTLIBRARIES)
|
||||||
|
|
||||||
|
$(srcdir)/Fabric.cpp: $(srcdir)/git_version.h
|
||||||
5
ibutils-rpmlintrc
Normal file
5
ibutils-rpmlintrc
Normal file
@ -0,0 +1,5 @@
|
|||||||
|
# This line is mandatory to access the configuration functions
|
||||||
|
from Config import *
|
||||||
|
|
||||||
|
addFilter("ibutils.* shared-lib-calls-exit")
|
||||||
|
addFilter("ibutils.* script-without-shebang")
|
||||||
37
ibutils-tk-8.6.patch
Normal file
37
ibutils-tk-8.6.patch
Normal file
@ -0,0 +1,37 @@
|
|||||||
|
From: Philipp Thomas <pth@suse.de>
|
||||||
|
Date: 2013-08-28 13:53:22+02:00
|
||||||
|
Subject: Adapt for tk 8.6
|
||||||
|
|
||||||
|
Expand the test to0 also find TK 8.6
|
||||||
|
|
||||||
|
---
|
||||||
|
ibdiag/config/tk.m4 | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
Index: ibdiag/config/tk.m4
|
||||||
|
===================================================================
|
||||||
|
--- ibdiag/config/tk.m4.orig 2010-10-07 10:11:24.000000000 +0200
|
||||||
|
+++ ibdiag/config/tk.m4 2013-08-28 13:52:28.710071238 +0200
|
||||||
|
@@ -18,11 +18,11 @@ dnl if we were not given a path - try fi
|
||||||
|
if test "x$with_tk_lib" = "xnone"; then
|
||||||
|
dirs="/usr /usr/local /usr/local/ibgd /usr/local/ibg2 /usr/local/ibed /usr/local/ofed"
|
||||||
|
for d in $dirs; do
|
||||||
|
- if test -e $d/lib/libtk8.4.so -o -e $d/lib/libtk8.5.so; then
|
||||||
|
+ if test -e $d/lib/libtk8.4.so -o -e $d/lib/libtk8.5.so -o -e $d/lib/libtk8.6.so; then
|
||||||
|
with_tk_lib=$d/lib
|
||||||
|
AC_MSG_NOTICE(TK: found in:$with_tk_lib)
|
||||||
|
fi
|
||||||
|
- if test -e $d/lib64/libtk8.4.so -o -e $d/lib64/libtk8.5.so; then
|
||||||
|
+ if test -e $d/lib64/libtk8.4.so -o -e $d/lib64/libtk8.5.so -o -e $d/lib64/libtk8.6.so; then
|
||||||
|
with_tk_lib=$d/lib64
|
||||||
|
AC_MSG_NOTICE(TK: found in:$with_tk_lib)
|
||||||
|
fi
|
||||||
|
@@ -30,7 +30,7 @@ if test "x$with_tk_lib" = "xnone"; then
|
||||||
|
fi
|
||||||
|
|
||||||
|
if test "x$with_tk_lib" = "xnone"; then
|
||||||
|
- AC_MSG_ERROR(TK: failed to find tk8.4 or tk8.5 lib. Please use --with-tk-lib)
|
||||||
|
+ AC_MSG_ERROR(TK: failed to find tk8.4, tk8.5 or tk8.6 lib. Please use --with-tk-lib)
|
||||||
|
fi
|
||||||
|
|
||||||
|
AC_SUBST(with_tk_lib)
|
||||||
227
ibutils.changes
Normal file
227
ibutils.changes
Normal file
@ -0,0 +1,227 @@
|
|||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 14 07:31:40 UTC 2021 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
||||||
|
|
||||||
|
- Unify changelog with SLE15
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 22 09:58:29 UTC 2021 - Jan Engelhardt <jengelh@inai.de>
|
||||||
|
|
||||||
|
- Trim old rpm constructs.
|
||||||
|
- Update descriptions.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Apr 15 15:38:24 UTC 2021 - Wolfgang Frisch <wolfgang.frisch@suse.com>
|
||||||
|
|
||||||
|
- Hardening: Link ibis executable with -pie (bsc#1184123).
|
||||||
|
- Added ibutils-ibis-PIE.patch
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Sun Jun 7 12:58:06 UTC 2020 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
||||||
|
|
||||||
|
- Add ibis-drop-multiple-definition-of-IbisObj.patch to fix compilation with GCC10
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 28 14:03:57 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
||||||
|
|
||||||
|
- Unify changelog with SLE12
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 28 07:37:02 UTC 2019 - Nicolas Morey-Chaisemartin <nmoreychaisemartin@suse.com>
|
||||||
|
|
||||||
|
- Fix older changelog entry that silently added a patch
|
||||||
|
- Use %license for COPYING
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 18 11:23:51 UTC 2018 - nmoreychaisemartin@suse.com
|
||||||
|
|
||||||
|
- Switch to multibuild system
|
||||||
|
- Remove empty lines from ibutils-ui description (bsc#1092319)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Aug 21 19:49:14 UTC 2018 - nmoreychaisemartin@suse.com
|
||||||
|
|
||||||
|
- Add ibutils-fix-build-dependency.patch to fix compilation
|
||||||
|
with -j1 (bsc#1102911)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed May 23 07:18:18 UTC 2018 - nmoreychaisemartin@suse.com
|
||||||
|
|
||||||
|
- Move ibdm and ibis library directories to libibdm1 package (bsc#1092166)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jun 2 13:18:19 UTC 2017 - nmoreychaisemartin@suse.com
|
||||||
|
|
||||||
|
- Fix ibutils-diagui.patch to not build ibdiagui
|
||||||
|
with the ibutils package.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jun 1 08:01:59 UTC 2017 - jengelh@inai.de
|
||||||
|
|
||||||
|
- Scriptlets and %packages need not be wrapped in %if.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Apr 28 16:38:48 UTC 2017 - jengelh@inai.de
|
||||||
|
|
||||||
|
- Normalize all macros
|
||||||
|
- Replace "1 tool" by one tool for better reading
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Mar 30 15:49:38 UTC 2017 - nmoreychaisemartin@suse.com
|
||||||
|
|
||||||
|
- Add ibutils-diagui.patch to allow UI less compilation
|
||||||
|
- Add a separate ibutils-ui package for UI tools. BSC #1030891
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Feb 23 20:51:12 UTC 2015 - mgorse@suse.com
|
||||||
|
|
||||||
|
- Add COPYING to package docs.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Feb 13 15:37:06 UTC 2015 - p.drouand@gmail.com
|
||||||
|
|
||||||
|
- Update to version 1.5.7-0.2
|
||||||
|
* No changelog available
|
||||||
|
- Remove ibutils-add_shebang.patch and ibutils-code_cleanup.patch
|
||||||
|
not needed anymore
|
||||||
|
- Use download Url as source
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Aug 21 14:54:14 CEST 2014 - pth@suse.de
|
||||||
|
|
||||||
|
- Ibutils Makefiles are missing dependencies so successfull builds
|
||||||
|
depend on timing so build in single job until fixed.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jul 18 13:08:19 CEST 2014 - pth@suse.de
|
||||||
|
|
||||||
|
- Add ibutils-no_special_ldflags_for_ibdmsh.patch to
|
||||||
|
remove the bogus rpath from ibdmsh and that vein do not link
|
||||||
|
ibdmsh statically.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Jul 17 13:10:08 CEST 2014 - pth@suse.de
|
||||||
|
|
||||||
|
- Do not build and install the dynamic library so remove all
|
||||||
|
traces.
|
||||||
|
- Remove .la files as they were only needed for the static libs.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jun 3 11:24:34 CEST 2014 - pth@suse.de
|
||||||
|
|
||||||
|
- Update to OFED 3.12 final.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 13 23:34:08 CEST 2014 - pth@suse.de
|
||||||
|
|
||||||
|
- Update to 1.5.7-0.2.gbd7e502 from OFED 3.12 RC2.
|
||||||
|
No change log present.
|
||||||
|
- Added the fix for two cases of forbidden implicit const removal
|
||||||
|
to ibutils-code_cleanup.patch.
|
||||||
|
- Remove ibutils-add_shebang.patch as the file it pathed doesn't
|
||||||
|
exist anymore.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Mar 5 15:43:44 CET 2014 - pth@suse.de
|
||||||
|
|
||||||
|
- Add COPYING to package docs.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Jan 17 13:21:45 CET 2014 - pth@suse.de
|
||||||
|
|
||||||
|
- Update to OFED 3.12 daily snapshot
|
||||||
|
- Use spdx.org format for license specification
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Aug 28 16:16:57 CEST 2013 - pth@suse.de
|
||||||
|
|
||||||
|
- Add ibutils-tk-8.6.patch to include tk 8.6 in the check for accetable
|
||||||
|
tk versions.
|
||||||
|
- Add ibutils-add_shebang.patch to add a shebang to git_version.tcl
|
||||||
|
which is installed in _bindir.
|
||||||
|
- Run fdupes to eleminate file duplication.
|
||||||
|
- Add a rpmlintrc file to silence useless warnings.
|
||||||
|
- Add ibutils-autotools.patch to modify the neccessary files
|
||||||
|
so that autoreconf can be called.
|
||||||
|
- (Build)Require graphviz-tcl as ibdiag won't work correctly without
|
||||||
|
the graphviz tcl plugin.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Sep 11 14:19:04 CEST 2012 - pth@suse.de
|
||||||
|
|
||||||
|
- Update to 1.5.7-0.1.g05a9d1a from OFED 1.5.4.1:
|
||||||
|
|
||||||
|
New Features:
|
||||||
|
* Added scripts that convert OSM dump files for ibdmchk
|
||||||
|
ibutils: added support for GUIDInfo MAD in ibis and simulator
|
||||||
|
|
||||||
|
Major Bugs Fixed:
|
||||||
|
* ibmgtsim: fixed various bugs with running simulations
|
||||||
|
* ibutils: fixed rpmbuild with and w/o ibmgtsim
|
||||||
|
|
||||||
|
Known Issues:
|
||||||
|
* Ibdiagnet "-wt" option may generate a bad topology file when
|
||||||
|
running on a cluster that contains complex switch systems.
|
||||||
|
|
||||||
|
* ibutils works only partially on any distro with TCL 8.5.
|
||||||
|
ibdiagnet/ibdiagpath/ibis don't work with TCL 8.5 due to a change
|
||||||
|
in TCL behavior: the built-in TCL function "dump" on TCL 8.5
|
||||||
|
always includes field names.
|
||||||
|
Until the fix, any user script that uses ibis needs to be fixed
|
||||||
|
in order to function correctly on TCL 8.5
|
||||||
|
|
||||||
|
- Adapt the patch.
|
||||||
|
- Package static library in a devel-static package.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue May 8 18:28:17 CEST 2012 - pth@suse.de
|
||||||
|
|
||||||
|
- BuildRequire automake, autoconf and libtool.
|
||||||
|
|
||||||
|
Tue May 25 01:30:35 CEST 2010 - jjolly@novell.com
|
||||||
|
|
||||||
|
- Updated to v1.5.4 from OFED 1.5.1
|
||||||
|
- Removed patch for libreplace
|
||||||
|
- Updated the retval patch to include a fix to CredLoops.cpp
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri May 14 23:44:28 CEST 2010 - jjolly@novell.com
|
||||||
|
|
||||||
|
- Updated the ibutils tarball to the one found in the OFED 1.4.2
|
||||||
|
release. There is no version change as the ibutils package in
|
||||||
|
OFED changed, but did not change version numbers.
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Thu Oct 16 04:42:41 CEST 2008 - jjolly@suse.de
|
||||||
|
|
||||||
|
- Updated with version from OFED 1.3.1 release
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Fri Feb 29 05:53:44 CET 2008 - jjolly@suse.de
|
||||||
|
|
||||||
|
- Updated with release from OFED 1.3 GA
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Tue Jan 29 22:36:30 CET 2008 - jjolly@suse.de
|
||||||
|
|
||||||
|
- Updated with release from OFED 1.3 rc2 (still v1.2)
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 9 11:54:29 CEST 2007 - hvogel@suse.de
|
||||||
|
|
||||||
|
- Use correct version number
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jul 4 11:53:35 CEST 2007 - hvogel@suse.de
|
||||||
|
|
||||||
|
- add GPL COPYING file [#288790]
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Mon Jul 2 15:20:44 CEST 2007 - hvogel@suse.de
|
||||||
|
|
||||||
|
- Update to the OFED 1.2 release
|
||||||
|
|
||||||
|
-------------------------------------------------------------------
|
||||||
|
Wed Jun 20 15:02:37 CEST 2007 - hvogel@suse.de
|
||||||
|
|
||||||
|
- Initial Package, Version 1.0
|
||||||
|
|
||||||
185
ibutils.spec
Normal file
185
ibutils.spec
Normal file
@ -0,0 +1,185 @@
|
|||||||
|
#
|
||||||
|
# spec file
|
||||||
|
#
|
||||||
|
# Copyright (c) 2021 SUSE LLC
|
||||||
|
#
|
||||||
|
# All modifications and additions to the file contributed by third parties
|
||||||
|
# remain the property of their copyright owners, unless otherwise agreed
|
||||||
|
# upon. The license for this file, and modifications and additions to the
|
||||||
|
# file, is the same license as for the pristine package itself (unless the
|
||||||
|
# license for the pristine package is not an Open Source License, in which
|
||||||
|
# case the license is the MIT License). An "Open Source License" is a
|
||||||
|
# license that conforms to the Open Source Definition (Version 1.9)
|
||||||
|
# published by the Open Source Initiative.
|
||||||
|
|
||||||
|
# Please submit bugfixes or comments via https://bugs.opensuse.org/
|
||||||
|
#
|
||||||
|
|
||||||
|
|
||||||
|
%global flavor @BUILD_FLAVOR@%{nil}
|
||||||
|
|
||||||
|
%if "%flavor" == "ui"
|
||||||
|
%define pname_suff -ui
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%define ibdm_major 1
|
||||||
|
%define upstream_ver 1.5.7
|
||||||
|
%define tar_rel 0.2
|
||||||
|
|
||||||
|
Name: ibutils%{?pname_suff}
|
||||||
|
Summary: OpenIB Mellanox InfiniBand Diagnostic Tools
|
||||||
|
License: BSD-3-Clause OR GPL-2.0-or-later
|
||||||
|
Group: Productivity/Networking/Diagnostic
|
||||||
|
Version: %upstream_ver.%tar_rel
|
||||||
|
Release: 0
|
||||||
|
Source0: https://www.openfabrics.org/downloads/ibutils/ibutils-%upstream_ver-%tar_rel.gbd7e502.tar.gz
|
||||||
|
Source1: ibutils-rpmlintrc
|
||||||
|
#PATCH-FIX-UPSTREAM Fix non-void functions returning no value
|
||||||
|
Patch1: ibutils-1.2-retval.patch
|
||||||
|
#PATCH-FIX-UPSTREAM Extend the check to include tk 8.6
|
||||||
|
Patch2: ibutils-tk-8.6.patch
|
||||||
|
#PATCH-FIX-UPSTREAM Prepare for autoreconf run
|
||||||
|
Patch4: ibutils-autotools.patch
|
||||||
|
#PATCH-FIX-UPSTREAM Do not link ibdmsh statically and remove rpath
|
||||||
|
Patch5: ibutils-no_special_ldflags_for_ibdmsh.patch
|
||||||
|
# Add --disable-ibdiagui option to allow for split builds
|
||||||
|
Patch6: ibutils-diagui.patch
|
||||||
|
Patch7: ibutils-fix-build-dependency.patch
|
||||||
|
Patch8: ibis-drop-multiple-definition-of-IbisObj.patch
|
||||||
|
Patch9: ibutils-ibis-PIE.patch
|
||||||
|
URL: http://www.openfabrics.org
|
||||||
|
BuildRequires: autoconf
|
||||||
|
BuildRequires: automake
|
||||||
|
BuildRequires: chrpath
|
||||||
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: gawk
|
||||||
|
BuildRequires: gcc-c++
|
||||||
|
BuildRequires: libibverbs-devel
|
||||||
|
BuildRequires: libtool
|
||||||
|
BuildRequires: opensm-devel
|
||||||
|
%if "%flavor" == "ui"
|
||||||
|
BuildRequires: graphviz-tcl
|
||||||
|
BuildRequires: swig
|
||||||
|
BuildRequires: tk-devel
|
||||||
|
Requires: graphviz-tcl
|
||||||
|
Requires: ibutils = %version
|
||||||
|
%else
|
||||||
|
BuildRequires: tcl-devel
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%description
|
||||||
|
%if "%flavor" == ""
|
||||||
|
The ibutils package provides a set of diagnostic tools that check the health
|
||||||
|
of an InfiniBand fabric.
|
||||||
|
|
||||||
|
Package components:
|
||||||
|
ibis: IB interface - A TCL shell that provides interface for sending various
|
||||||
|
MADs on the IB fabric. This is the component that actually accesses
|
||||||
|
the IB Hardware.
|
||||||
|
|
||||||
|
ibdm: IB Data Model - A library that provides IB fabric analysis.
|
||||||
|
|
||||||
|
ibmgtsim: An IB fabric simulator. Useful for developing IB tools.
|
||||||
|
|
||||||
|
ibdiag: This package provides two tools which provide the user interface
|
||||||
|
to activate the above functionality:
|
||||||
|
- ibdiagnet: Performs various quality and health checks on the IB
|
||||||
|
fabric.
|
||||||
|
- ibdiagpath: Performs various fabric quality and health checks on
|
||||||
|
the given links and nodes in a specific path.
|
||||||
|
%else
|
||||||
|
The ibutils-ui package provides a set of graphical UI tools that check the health
|
||||||
|
of an InfiniBand fabric.
|
||||||
|
|
||||||
|
Package components:
|
||||||
|
ibdiag: This package provides one tool which provide the user interface
|
||||||
|
to activate the above functionality:
|
||||||
|
- ibdiagui: A GUI wrapper for ibdiagnet and ibdiagpath.
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%package devel
|
||||||
|
Summary: SDK for OpenIB Mellanox InfiniBand Diagnostic Tools
|
||||||
|
Group: Development/Libraries/C and C++
|
||||||
|
Requires: %name = %version
|
||||||
|
Requires: libibdm%ibdm_major = %version
|
||||||
|
|
||||||
|
%description devel
|
||||||
|
ibutils provides IB network and path diagnostics.
|
||||||
|
|
||||||
|
%package -n libibdm%ibdm_major
|
||||||
|
Summary: Infiniband Data Model library
|
||||||
|
Group: System/Libraries
|
||||||
|
|
||||||
|
%description -n libibdm%ibdm_major
|
||||||
|
This package contains shared libraries for the IB utils.
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%setup -q -n ibutils-%upstream_ver
|
||||||
|
%patch1
|
||||||
|
%patch2
|
||||||
|
%patch4
|
||||||
|
%patch5
|
||||||
|
%patch6
|
||||||
|
%patch7
|
||||||
|
%patch8
|
||||||
|
%patch9 -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
autoreconf -fi
|
||||||
|
./autogen.sh
|
||||||
|
%if "%flavor" == ""
|
||||||
|
%configure --with-graphviz-lib=%_libdir --disable-static --disable-ibdiagui
|
||||||
|
%make_build
|
||||||
|
%else
|
||||||
|
%configure --with-graphviz-lib=%_libdir --disable-static
|
||||||
|
%make_build -Cibdiag
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%install
|
||||||
|
export NO_BRP_TCL_INDEX_CHECK=true
|
||||||
|
%if "%flavor" == ""
|
||||||
|
%make_install
|
||||||
|
%else
|
||||||
|
%make_install -Cibdiag/
|
||||||
|
rm -f %buildroot%_bindir/git_version.tcl %buildroot%_bindir/ibdiagnet %buildroot%_bindir/ibdiagpath
|
||||||
|
rm -Rf %buildroot%_libdir/ibdiagnet* %buildroot%_libdir/ibdiagpath*
|
||||||
|
rm -f %buildroot%_mandir/man1/ibdiagnet.1* %buildroot%_mandir/man1/ibdiagpath.1*
|
||||||
|
%endif
|
||||||
|
%fdupes -s %buildroot%_libdir
|
||||||
|
rm -f %buildroot%_libdir/*.la %buildroot%_libdir/*.a
|
||||||
|
|
||||||
|
%post -n libibdm%ibdm_major -p /sbin/ldconfig
|
||||||
|
%postun -n libibdm%ibdm_major -p /sbin/ldconfig
|
||||||
|
|
||||||
|
%if "%flavor" == ""
|
||||||
|
|
||||||
|
%files
|
||||||
|
%license COPYING
|
||||||
|
%_bindir/*
|
||||||
|
%_libdir/ibdiagnet%upstream_ver
|
||||||
|
%_libdir/ibdiagpath%upstream_ver
|
||||||
|
|
||||||
|
%files -n libibdm%ibdm_major
|
||||||
|
%_libdir/libibdm.so.*
|
||||||
|
%_libdir/libibdmcom.so.*
|
||||||
|
%_libdir/libibsysapi.so.*
|
||||||
|
%_libdir/ibdm%upstream_ver
|
||||||
|
%_libdir/ibis%upstream_ver
|
||||||
|
|
||||||
|
%files devel
|
||||||
|
%_includedir/ibdm
|
||||||
|
%_libdir/libibdm.so
|
||||||
|
%_libdir/libibdmcom.so
|
||||||
|
%_libdir/libibsysapi.so
|
||||||
|
%_mandir/man1/*
|
||||||
|
|
||||||
|
%else
|
||||||
|
|
||||||
|
%files
|
||||||
|
%license COPYING
|
||||||
|
%_bindir/ibdiagui
|
||||||
|
%_libdir/ibdiagui%upstream_ver
|
||||||
|
%_mandir/man1/ibdiagui*
|
||||||
|
%endif
|
||||||
|
|
||||||
|
%changelog
|
||||||
Loading…
Reference in New Issue
Block a user