Hello community,
here is the log from the commit of package opensm
checked in at Fri Aug 24 01:51:54 CEST 2007.
--------
--- opensm/opensm.changes 2007-08-07 13:41:48.000000000 +0200
+++ /mounts/work_src_done/STABLE/opensm/opensm.changes 2007-08-20 21:07:05.000000000 +0200
@@ -1,0 +2,7 @@
+Mon Aug 20 17:37:40 CEST 2007 - hvogel@suse.de
+
+- Update to version from OFED 1.2.5
+- readd the init scripts from OFED instead of the default opensm
+ one
+
+-------------------------------------------------------------------
New:
----
opensmd
sldd.sh
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ opensm.spec ++++++
--- /var/tmp/diff_new_pack.U24303/_old 2007-08-24 01:51:46.000000000 +0200
+++ /var/tmp/diff_new_pack.U24303/_new 2007-08-24 01:51:46.000000000 +0200
@@ -13,11 +13,13 @@
Name: opensm
Summary: Infiniband Subnet Manager
Version: 3.0.3
-Release: 10
+Release: 14
License: BSD 3-Clause, GPL v2 or later
Group: System/Libraries
Source0: %{name}-%{version}.tar.bz2
Source1: conf.sysconfig
+Source2: sldd.sh
+Source3: opensmd
URL: http://www.openfabrics.org
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: gcc-c++ libibumad-devel libibverbs-devel
@@ -63,16 +65,23 @@
%prep
%setup -q
-cp %{S:1} .
+cp %{S:1} %{S:2} %{S:3} .
%build
%configure
make
%install
+export NO_BRP_STALE_LINK_ERROR=yes
make DESTDIR=$RPM_BUILD_ROOT install
+# get rid of the included init script because we bring our own one
+rm $RPM_BUILD_ROOT%_sysconfdir/init.d/opensm
+install -m 755 opensmd $RPM_BUILD_ROOT%_sysconfdir/init.d/
+install -D sldd.sh $RPM_BUILD_ROOT/%_bindir/sldd.sh
# install the sysconfig configuration file
install -m 700 -D conf.sysconfig ${RPM_BUILD_ROOT}/var/adm/fillup-templates/sysconfig.%name
+# and make a compat link
+ln -s %_sysconfdir/sysconfig/opensm ${RPM_BUILD_ROOT}/%_sysconfdir/opensm.conf
%clean
rm -rf ${RPM_BUILD_ROOT}
@@ -89,7 +98,9 @@
%files
%defattr(-, root, root)
-%_sysconfdir/init.d/opensm
+%_sysconfdir/opensm.conf
+
+%_sysconfdir/init.d/opensmd
%_bindir/*
%_libdir/libopensm.so.*
%_libdir/libosmcomp.so.*
@@ -119,6 +130,10 @@
%_libdir/libosmvendor-*.so
%changelog
+* Mon Aug 20 2007 - hvogel@suse.de
+- Update to version from OFED 1.2.5
+- readd the init scripts from OFED instead of the default opensm
+ one
* Tue Aug 07 2007 - hvogel@suse.de
- Update to version from OFED 1.2c
* Thu Jul 12 2007 - hvogel@suse.de
++++++ conf.sysconfig ++++++
--- opensm/conf.sysconfig 2007-08-07 13:33:27.000000000 +0200
+++ /mounts/work_src_done/STABLE/opensm/conf.sysconfig 2007-08-20 18:09:42.000000000 +0200
@@ -1,9 +1,260 @@
## Path: System/Infiniband/opensm
## Description: Infiniband opensm configuration
+## Type: string(0,1,2,3,4,10,none)
+## Default: none
+## ServiceRestart: opensmd
+#
+# This option specifies a debug option.
+# These options are not normally needed.
+# The number following -d selects the debug
+# option to enable as follows:
+# OPT Description
+# --- -----------------
+# 0 - Ignore other SM nodes.
+# 1 - Force single threaded dispatching.
+# 2 - Force log flushing after each log message.
+# 3 - Disable multicast support.
+# 4 - Put OpenSM in memory tracking mode.
+# 10.. Put OpenSM in testability mode.
+# none, no debug options are enabled.
+#
+DEBUG=none
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: integer(0:7)
+## Default: 0
+## ServiceRestart: opensmd
+#
+# This option specifies the subnet's LMC value.
+# The number of LIDs assigned to each port is 2^LMC.
+# The LMC value must be in the range 0-7.
+# LMC values > 0 allow multiple paths between ports.
+# LMC values > 0 should only be used if the subnet
+# topology actually provides multiple paths between
+# ports, i.e. multiple interconnects between switches.
+# OpenSM defaults to LMC = 0, which allows
+# one path between any two ports.
+#
+LMC=0
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: integer
+## Default: 0
+## ServiceRestart: opensmd
+#
+# This option specifies the number of VL15 SMP MADs
+# allowed on the wire at any one time.
+# Specifying -maxsmps 0 allows unlimited outstanding SMPs.
+# Without -maxsmps, OpenSM defaults to a maximum of
+# one outstanding SMP.
+#
+MAXSMPS=0
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: yesno
+## Default: no
+## ServiceRestart: opensmd
+#
+# This option causes OpenSM to reassign LIDs to all
+# end nodes. Specifying "REASSIGN_LIDS=yes" on a running subnet
+# may disrupt subnet traffic.
+# With "REASSIGN_LIDS=no", OpenSM attempts to preserve existing
+# LID assignments resolving multiple use of same LID.
+#
+REASSIGN_LIDS="no"
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: integer
+## Default: 10
+## ServiceRestart: opensmd
+#
+# This option specifies the number of seconds between
+# subnet sweeps. Specifying SWEEP=0 disables sweeping.
+# OpenSM defaults to a sweep interval of 10 seconds.
+#
+SWEEP=10
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: integer
+## Default: 200
+## ServiceRestart: opensmd
+#
+# This option specifies the time in milliseconds
+# used for transaction timeouts.
+# Specifying -t 0 disables timeouts.
+# Without -t, OpenSM defaults to a timeout value of
+# 200 milliseconds.
+#
+TIMEOUT=200
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: string
+## Default: /var/log/osm.log
+## ServiceRestart: opensmd
+#
+# This option defines the log to be the given file.
+# By default the log goes to /var/log/osm.log.
+# For the log to go to standard output use OSM_LOG=stdout.
+#
+OSM_LOG=/var/log/osm.log
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: string
+## Default: none
+## ServiceRestart: opensmd
+#
+# This option increases the log verbosity level.
+# The "-v" option may be specified multiple times
+# to further increase the verbosity level.
+# "-V" option sets the maximum verbosity level and
+# forces log flushing.
+# The "-V" is equivalent to "-vf 0xFF -d 2".
+#
+VERBOSE="none"
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: string
+## Default: off
+## ServiceRestart: opensmd
+#
+# This option activate UPDN algorithm instead of Min Hop
+# algorithm (default).
+# To switch on UPDN algorithm set UPDN="on"
+#
+UPDN="off"
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: string
+## Default: none
+## ServiceRestart: opensmd
+#
+# This option only allowed when UPDN algorithm is activated
+# It specifies the guid list file from which to fetch the guid list
+# The file contain in each line only one valid guid
+#
+GUID_FILE="none"
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: integer
+## Default: 0
+## ServiceRestart: opensmd
+#
+# This option specifies the local port GUID value
+# with which OpenSM should bind. OpenSM may be
+# bound to 1 port at a time.
+# If GUID given is 0, opensmd use PORT_NUM parameter.
+# Without -g (GUID="none"), OpenSM trys to use the default port.
+#
+GUID=0
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
## Type: string
## Default: ""
-## ServiceRestart: opensm
+## ServiceRestart: opensmd
+#
+# The list of all SM's IP addresses in InfiniBand subnet
+# Used to handover mechanism
+#
+OSM_HOSTS=""
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: string
+## Default: /var/cache/osm
+## ServiceRestart: opensmd
+#
+# OSM_CACHE_DIR
+#
+OSM_CACHE_DIR=/var/cache/osm
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: string(--cache-options,-c,none)
+## Default: none
+## ServiceRestart: opensmd
+#
+# Cache the given command line options into the file
+# /var/cache/osm/opensm.opts for use next invocation
+# The cache directory can be changed by the environment
+# variable OSM_CACHE_DIR
+# Set to '--cache-options' or '-c' in order to enable
+#
+CACHE_OPTIONS="none"
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: string(--honor_guid2lid,-x,none)
+## Default: none
+## ServiceRestart: opensmd
+#
+# This option forces OpenSM to honor the guid2lid file,
+# when it comes out of Standby state, if such file exists
+# under OSM_CACHE_DIR, and is valid.
+# Set to '--honor_guid2lid' or '-x' to enable.
+# By default this is FALSE. Will be set automatically to '--honor_guid2lid'
+# if OSM_HOSTS includes list of more then one IP addresses.
+#
+HONORE_GUID2LID="none"
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: string
+## Default: /usr/bin/scp
+## ServiceRestart: opensmd
+#
+# This option osed by SLDD daemon for handover mechanism
+# to copy local cache file to remote computer
+#
+RCP=/usr/bin/scp
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: string
+## Default: /usr/bin/ssh
+## ServiceRestart: opensmd
+#
+# This option osed by SLDD daemon for handover mechanism
+# to execute commands on remote computer
+#
+RSH=/usr/bin/ssh
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: integer
+## Default: 60
+## ServiceRestart: opensmd
+#
+# This option osed by SLDD daemon for handover mechanism
+# Time between sweep of sldd daemon in seconds
+RESCAN_TIME=60
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: integer
+## Default: 1
+## ServiceRestart: opensmd
+#
+# This option defines HCA's port number which OpenSM should bind
+#
+PORT_NUM=1
+
+## Path: System/Infiniband/opensm
+## Description: Infiniband opensm configuration
+## Type: yesno
+## Default: no
+## ServiceRestart: opensmd
#
-# opensm options
+# To start OpenSM automatically set ONBOOT=yes
#
-OPTIONS=""
+ONBOOT=no
++++++ opensm-3.0.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensm-3.0.3/include/opensm/osm_base.h new/opensm-3.0.3/include/opensm/osm_base.h
--- old/opensm-3.0.3/include/opensm/osm_base.h 2007-08-05 15:01:10.000000000 +0200
+++ new/opensm-3.0.3/include/opensm/osm_base.h 2007-08-14 17:38:04.000000000 +0200
@@ -311,11 +311,11 @@
* DESCRIPTION
* Sets the time a packet can live in the head of the VL Queue
* of a port that drives a CA port.
-* We use here the value of ~130usec
+* We use here the value of ~256msec
*
* SYNOPSIS
*/
-#define OSM_DEFAULT_LEAF_HEAD_OF_QUEUE_LIFE 0xC
+#define OSM_DEFAULT_LEAF_HEAD_OF_QUEUE_LIFE 0x10
/***********/
/****d* OpenSM: Base/OSM_DEFAULT_VL_STALL_COUNT
@@ -341,11 +341,10 @@
* puts the VL into stalled state. In stalled state, the port is supposed
* to drop everything for 8*(head of queue lifetime). This value is for
* switch ports driving a CA port.
-* We use the value of 1 here - so any drop due to HOQ means stalling the VL
*
* SYNOPSIS
*/
-#define OSM_DEFAULT_LEAF_VL_STALL_COUNT 0x1
+#define OSM_DEFAULT_LEAF_VL_STALL_COUNT 0x7
/***********/
/****d* OpenSM: Base/OSM_DEFAULT_TRAP_SUPRESSION_TIMEOUT
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensm-3.0.3/include/opensm/osm_version.h new/opensm-3.0.3/include/opensm/osm_version.h
--- old/opensm-3.0.3/include/opensm/osm_version.h 2007-08-05 15:01:11.000000000 +0200
+++ new/opensm-3.0.3/include/opensm/osm_version.h 2007-08-14 17:38:04.000000000 +0200
@@ -55,7 +55,7 @@
*
* SYNOPSIS
*/
-#define OSM_VERSION "OpenSM Rev:openib-3.0.13"
+#define OSM_VERSION "OpenSM Rev:openib-3.0.14"
/********/
END_C_DECLS
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/opensm-3.0.3/opensm/ChangeLog new/opensm-3.0.3/opensm/ChangeLog
--- old/opensm-3.0.3/opensm/ChangeLog 2007-08-05 15:01:11.000000000 +0200
+++ new/opensm-3.0.3/opensm/ChangeLog 2007-08-14 17:38:04.000000000 +0200
@@ -1,3 +1,9 @@
+2007-06-04 Yevgeny Kliteynik