diff --git a/.cvsignore b/.cvsignore index 78cfadd..b4e3f7d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -1 +1,2 @@ opensm-3.2.1.tar.gz +opensm-3.3.1.tar.gz diff --git a/opensm-3.2.1-rpath.patch b/opensm-3.2.1-rpath.patch deleted file mode 100644 index 871dcbb..0000000 --- a/opensm-3.2.1-rpath.patch +++ /dev/null @@ -1,113 +0,0 @@ ---- opensm-3.2.1/libvendor/Makefile.am.rpath 2008-01-15 15:23:51.000000000 -0500 -+++ opensm-3.2.1/libvendor/Makefile.am 2008-06-30 11:03:22.000000000 -0400 -@@ -94,8 +94,8 @@ EXTRA_DIST = $(srcdir)/libosmvendor.map - # name. What we can do it create a link to the installed file such - # that it will mark it with an alias... - # we find the new lib by traversing the links --install-exec-hook: -- if test -L $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; fi; \ -- lname=`\ls -l $(DESTDIR)/$(libdir)/libosmvendor.so | awk '{print $$NF}'`; \ -- ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor_$(with_osmv).so; \ -- ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so -+#install-exec-hook: -+# if test -L $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so; fi; \ -+# lname=`\ls -l $(DESTDIR)/$(libdir)/libosmvendor.so | awk '{print $$NF}'`; \ -+# ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor_$(with_osmv).so; \ -+# ln -s $$lname $(DESTDIR)/$(libdir)/libosmvendor-$(VERSION).so ---- opensm-3.2.1/opensm/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400 -+++ opensm-3.2.1/opensm/Makefile.am 2008-06-30 11:11:40.000000000 -0400 -@@ -79,7 +79,7 @@ endif - if OSMV_SIM - USEGPPLINK = $(LIBTOOL) --mode=link g++ $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ - libopensm.la: $(libopensm_la_OBJECTS) $(libopensm_la_DEPENDENCIES) -- $(USEGPPLINK) -rpath $(libdir) $(libopensm_la_LDFLAGS) $(libopensm_la_OBJECTS) $(libopensm_la_LIBADD) $(LIBS) -+ $(USEGPPLINK) $(libopensm_la_LDFLAGS) $(libopensm_la_OBJECTS) $(libopensm_la_LIBADD) $(LIBS) - opensm$(EXEEXT): $(opensm_OBJECTS) $(opensm_DEPENDENCIES) - @rm -f opensm$(EXEEXT) - $(USEGPPLINK) $(opensm_LDFLAGS) $(opensm_OBJECTS) $(opensm_LDADD) $(LIBS) -@@ -87,9 +87,9 @@ endif - - # we need to be able to load libraries from local build subtree before make install - # we always give precedence to local tree libs and then use the pre-installed ones. --opensm_LDADD = -L../complib -L../libvendor -L. $(OSMV_LDADD) -lopensm -losmcomp -losmvendor -+opensm_LDADD = -L../complib -losmcomp -L../libvendor -losmvendor -L. -lopensm - --opensm_LDFLAGS = -Wl,--rpath -Wl,$(libdir) -lpthread -ldl -+opensm_LDFLAGS = -lpthread -ldl - - opensmincludedir = $(includedir)/infiniband/opensm - -@@ -124,10 +124,10 @@ EXTRA_DIST = $(srcdir)/libopensm.map $(s - # name. What we can do it create a link to the installed file such - # that it will mark it with an alias... - # we find the new lib by traversing the links --install-exec-hook: -- if test -L $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; fi; \ -- lname=`\ls -l $(DESTDIR)/$(libdir)/libopensm.so | awk '{print $$NF}'`; \ -- ln -s $$lname $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so -+#install-exec-hook: -+# if test -L $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so; fi; \ -+# lname=`\ls -l $(DESTDIR)/$(libdir)/libopensm.so | awk '{print $$NF}'`; \ -+# ln -s $$lname $(DESTDIR)/$(libdir)/libopensm-$(VERSION).so - - # generate c and h files from the lex and yacc files - dist-hook: $(srcdir)/osm_qos_parser_y.c $(srcdir)/osm_qos_parser_l.c ---- opensm-3.2.1/osmtest/Makefile.am.rpath 2008-03-12 17:43:17.000000000 -0400 -+++ opensm-3.2.1/osmtest/Makefile.am 2008-06-30 11:03:22.000000000 -0400 -@@ -18,10 +18,10 @@ osmtest_CFLAGS = -Wall $(OSMV_CFLAGS) -D - else - osmtest_CFLAGS = -Wall $(OSMV_CFLAGS) -DVENDOR_RMPP_SUPPORT $(DBGFLAGS) - endif --osmtest_LDADD = -L../complib -L../libvendor -L../opensm -L$(libdir) -L. \ -- $(OSMV_LDADD) -lopensm -losmcomp -losmvendor -+osmtest_LDADD = -L../complib -losmcomp -L../libvendor -losmvendor \ -+ -L../opensm -lopensm - --osmtest_LDFLAGS = -Wl,--rpath -Wl,$(libdir) -lpthread -L../opensm -+osmtest_LDFLAGS = -lpthread - # for linking with the simulator client library we have to use g++: - if OSMV_SIM - USEGPPLINK = $(LIBTOOL) --mode=link g++ $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) $(LDFLAGS) -o $@ ---- opensm-3.2.1/complib/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400 -+++ opensm-3.2.1/complib/Makefile.am 2008-06-30 11:03:22.000000000 -0400 -@@ -85,7 +85,7 @@ EXTRA_DIST = $(srcdir)/libosmcomp.map $( - # name. What we can do it create a link to the installed file such - # that it will mark it with an alias... - # we find the new lib by traversing the links --install-exec-hook: -- if test -L $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; fi; \ -- lname=`\ls -l $(DESTDIR)/$(libdir)/libosmcomp.so | awk '{print $$NF}'`; \ -- ln -s $$lname $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so -+#install-exec-hook: -+# if test -L $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; then rm $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so; fi; \ -+# lname=`\ls -l $(DESTDIR)/$(libdir)/libosmcomp.so | awk '{print $$NF}'`; \ -+# ln -s $$lname $(DESTDIR)/$(libdir)/libosmcomp-$(VERSION).so ---- opensm-3.2.1/Makefile.am.rpath 2008-03-12 17:43:16.000000000 -0400 -+++ opensm-3.2.1/Makefile.am 2008-06-30 11:03:22.000000000 -0400 -@@ -9,16 +9,16 @@ MAINTAINERCLEANFILES = Makefile.in acloc - ACLOCAL = aclocal -I $(ac_aux_dir) - - # we should provide a hint for other apps about the build mode of this project --install-exec-hook: -- mkdir -p $(DESTDIR)/$(includedir) --if DEBUG -- echo "define osm_build_type \"debug\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h --else -- echo "define osm_build_type \"free\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h --endif -- $(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/init.d -- cp $(top_builddir)/scripts/opensm.init $(DESTDIR)/$(sysconfdir)/init.d/opensmd -- chmod 755 $(DESTDIR)/$(sysconfdir)/init.d/opensmd -+#install-exec-hook: -+# mkdir -p $(DESTDIR)/$(includedir) -+#if DEBUG -+# echo "define osm_build_type \"debug\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h -+#else -+# echo "define osm_build_type \"free\"" > $(DESTDIR)/$(includedir)/infiniband/opensm/osm_build_id.h -+#endif -+# $(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/init.d -+# cp $(top_builddir)/scripts/opensm.init $(DESTDIR)/$(sysconfdir)/init.d/opensmd -+# chmod 755 $(DESTDIR)/$(sysconfdir)/init.d/opensmd - - - man_MANS = man/opensm.8 man/osmtest.8 diff --git a/opensm.conf b/opensm.conf index 5db81dc..15cde45 100644 --- a/opensm.conf +++ b/opensm.conf @@ -1,129 +1,310 @@ -OPTIONS="-B" -# DEBUG mode -# 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. -# OPTIONS="$OPTIONS -d 1" - -# LMC -# 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. -# OPTIONS="$OPTIONS -l 0" - -# MAXSMPS -# 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 -# four outstanding SMP. -OPTIONS="$OPTIONS -maxsmps 0" - -# REASSIGN_LIDS -# 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. -# OPTIONS="$OPTIONS -r" - -# SWEEP -# This option specifies the number of seconds between -# subnet sweeps. Specifying SWEEP=0 disables sweeping. -# OpenSM defaults to a sweep interval of 10 seconds. -# OPTIONS="$OPTIONS -s 10" - -# TIMEOUT -# 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. -# OPTIONS="$OPTIONS -t 200" - -# OSM_LOG -# This option defines the log to be the given file. -# By default the log goes to /tmp/osm.log, which isn't very suitable -# for a distribution, so we override it by default here. -# For the log to go to standard output use OSM_LOG=stdout. -OPTIONS="$OPTIONS -f /var/log/opensm.log" - -# QoS -# This option enable QoS support in opensm -# OPTIONS="$OPTIONS -Q" - -# QoS_POLICY -# This option sets the file from which to load the QoS policy -# OPTIONS="$OPTIONS -Y /etc/rdma/qos_policy" - -# VERBOSE -# 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". -# OPTIONS="$OPTIONS -v 0x00" - -# ROUTING_ENGINE -# This option chooses the routing engine to use instead of the default -# algorithm Min Hop -# Supported engines are: updn, file, ftree, lash, dor -# OPTIONS="$OPTIONS -R updn" - -# ROOT_GUID_FILE -# This option only allowed when UPDN algorithm is activated -# It specifies the guid list file from which to fetch the root node guid list -# The file contain in each line only one valid guid -# OPTIONS="$OPTIONS -a /etc/rdma/root_guids" - -# CN_GUID_FILE -# This option only allowed when UPDN algorithm is activated -# It specifies the guid list file from which to fetch the compute node -# guid list -# The file contain in each line only one valid guid -# OPTIONS="$OPTIONS -u /etc/rdma/cn_guids" - -# GUID -# 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, opensm would list the available guids and wait for -# the user to select one (which obviously is no use in an init script) -# Without -g, OpenSM trys to use the default port. -# OPTIONS="$OPTIONS -g " - -# PRIORITY -# This option specifies the SM's PRIORITY. -# This will effect the handover cases, where master -# is chosen by priority and GUID. Range goes -# from 0 (lowest priority) to 15 (highest). -OPTIONS="$OPTIONS -p 15" - -# OSM_CACHE_DIR -# There is no command line option to opensm to set this, it can only be set -# as an environment variable. -OSM_CACHE_DIR=/var/cache/opensm - -# CACHE_OPTIONS -# Cache the given command line options into the file -# OSM_CACHE_DIR/opensm.opts for use next invocation -# Set to '--cache-options' or '-c' in order to enable -# OPTIONS="$OPTIONS -c" +# +# DEVICE ATTRIBUTES OPTIONS +# +# The port GUID on which the OpenSM is running +guid 0x0000000000000000 + +# M_Key value sent to all ports qualifying all Set(PortInfo) +m_key 0x0000000000000000 + +# The lease period used for the M_Key on this subnet in [sec] +m_key_lease_period 0 + +# SM_Key value of the SM used for SM authentication +sm_key 0x0000000000000001 + +# SM_Key value to qualify rcv SA queries as 'trusted' +sa_key 0x0000000000000001 + +# Note that for both values above (sm_key and sa_key) +# OpenSM version 3.2.1 and below used the default value '1' +# in a host byte order, it is fixed now but you may need to +# change the values to interoperate with old OpenSM running +# on a little endian machine. + +# Subnet prefix used on this subnet +subnet_prefix 0xfe80000000000000 + +# The LMC value used on this subnet +lmc 0 + +# lmc_esp0 determines whether LMC value used on subnet is used for +# enhanced switch port 0. If TRUE, LMC value for subnet is used for +# ESP0. Otherwise, LMC value for ESP0s is 0. +lmc_esp0 FALSE + +# The code of maximal time a packet can live in a switch +# The actual time is 4.096usec * 2^ +# The value 0x14 disables this mechanism +packet_life_time 0x12 + +# The number of sequential packets dropped that cause the port +# to enter the VLStalled state. The result of setting this value to +# zero is undefined. +vl_stall_count 0x07 + +# The number of sequential packets dropped that cause the port +# to enter the VLStalled state. This value is for switch ports +# driving a CA or router port. The result of setting this value +# to zero is undefined. +leaf_vl_stall_count 0x07 + +# The code of maximal time a packet can wait at the head of +# transmission queue. +# The actual time is 4.096usec * 2^ +# The value 0x14 disables this mechanism +head_of_queue_lifetime 0x12 + +# The maximal time a packet can wait at the head of queue on +# switch port connected to a CA or router port +leaf_head_of_queue_lifetime 0x10 + +# Limit the maximal operational VLs +max_op_vls 5 + +# Force PortInfo:LinkSpeedEnabled on switch ports +# If 0, don't modify PortInfo:LinkSpeedEnabled on switch port +# Otherwise, use value for PortInfo:LinkSpeedEnabled on switch port +# Values are (IB Spec 1.2.1, 14.2.5.6 Table 146 "PortInfo") +# 1: 2.5 Gbps +# 3: 2.5 or 5.0 Gbps +# 5: 2.5 or 10.0 Gbps +# 7: 2.5 or 5.0 or 10.0 Gbps +# 2,4,6,8-14 Reserved +# Default 15: set to PortInfo:LinkSpeedSupported +force_link_speed 15 + +# The subnet_timeout code that will be set for all the ports +# The actual timeout is 4.096usec * 2^ +subnet_timeout 18 + +# Threshold of local phy errors for sending Trap 129 +local_phy_errors_threshold 0x08 + +# Threshold of credit overrun errors for sending Trap 130 +overrun_errors_threshold 0x08 + +# +# PARTITIONING OPTIONS +# +# Partition configuration file to be used +partition_config_file /etc/ofed/partitions.conf + +# Disable partition enforcement by switches +no_partition_enforcement FALSE + +# +# SWEEP OPTIONS +# +# The number of seconds between subnet sweeps (0 disables it) +sweep_interval 10 + +# If TRUE cause all lids to be reassigned +reassign_lids FALSE + +# If TRUE forces every sweep to be a heavy sweep +force_heavy_sweep FALSE + +# If TRUE every trap will cause a heavy sweep. +# NOTE: successive identical traps (>10) are suppressed +sweep_on_trap TRUE + +# +# ROUTING OPTIONS +# +# If TRUE count switches as link subscriptions +port_profile_switch_nodes FALSE + +# Name of file with port guids to be ignored by port profiling +port_prof_ignore_file (null) + +# Routing engine +# Multiple routing engines can be specified separated by +# commas so that specific ordering of routing algorithms will +# be tried if earlier routing engines fail. +# Supported engines: minhop, updn, file, ftree, lash, dor +routing_engine (null) + +# Connect roots (use FALSE if unsure) +connect_roots FALSE + +# Use unicast routing cache (use FALSE if unsure) +use_ucast_cache FALSE + +# Lid matrix dump file name +lid_matrix_dump_file (null) + +# LFTs file name +lfts_file (null) + +# The file holding the root node guids (for fat-tree or Up/Down) +# One guid in each line +root_guid_file (null) + +# The file holding the fat-tree compute node guids +# One guid in each line +cn_guid_file (null) + +# The file holding the node ids which will be used by Up/Down algorithm instead +# of GUIDs (one guid and id in each line) +ids_guid_file (null) + +# The file holding guid routing order guids (for MinHop and Up/Down) +guid_routing_order_file (null) + +# SA database file name +sa_db_file (null) + +# +# HANDOVER - MULTIPLE SMs OPTIONS +# +# SM priority used for deciding who is the master +# Range goes from 0 (lowest priority) to 15 (highest). +sm_priority 15 + +# If TRUE other SMs on the subnet should be ignored +ignore_other_sm FALSE + +# Timeout in [msec] between two polls of active master SM +sminfo_polling_timeout 10000 + +# Number of failing polls of remote SM that declares it dead +polling_retry_number 4 + +# If TRUE honor the guid2lid file when coming out of standby +# state, if such file exists and is valid +honor_guid2lid_file FALSE + +# +# TIMING AND THREADING OPTIONS +# +# Maximum number of SMPs sent in parallel +max_wire_smps 32 + +# The maximum time in [msec] allowed for a transaction to complete +transaction_timeout 200 + +# Maximal time in [msec] a message can stay in the incoming message queue. +# If there is more than one message in the queue and the last message +# stayed in the queue more than this value, any SA request will be +# immediately returned with a BUSY status. +max_msg_fifo_timeout 10000 + +# Use a single thread for handling SA queries +single_thread FALSE + +# +# MISC OPTIONS +# +# Daemon mode +daemon TRUE + +# SM Inactive +sm_inactive FALSE + +# Babbling Port Policy +babbling_port_policy FALSE + +# +# Event Plugin Options +# +event_plugin_name (null) + +# +# Node name map for mapping node's to more descriptive node descriptions +# (man ibnetdiscover for more information) +# +node_name_map_name (null) + +# +# DEBUG FEATURES +# +# The log flags used +log_flags 0x03 + +# Force flush of the log file after each log message +force_log_flush FALSE + +# Log file to be used +log_file /var/log/opensm.log + +# Limit the size of the log file in MB. If overrun, log is restarted +log_max_size 0 + +# If TRUE will accumulate the log over multiple OpenSM sessions +accum_log_file TRUE + +# The directory to hold the file OpenSM dumps +dump_files_dir /var/log/ + +# If TRUE enables new high risk options and hardware specific quirks +enable_quirks FALSE + +# If TRUE disables client reregistration +no_clients_rereg FALSE + +# If TRUE OpenSM should disable multicast support and +# no multicast routing is performed if TRUE +disable_multicast FALSE + +# If TRUE opensm will exit on fatal initialization issues +exit_on_fatal TRUE + +# console [off|local] +console off + +# Telnet port for console (default 10000) +console_port 10000 + +# +# QoS OPTIONS +# +# Enable QoS setup +qos FALSE + +# QoS policy file to be used +qos_policy_file /etc/ofed/qos-policy.conf + +# QoS default options +qos_max_vls 0 +qos_high_limit -1 +qos_vlarb_high (null) +qos_vlarb_low (null) +qos_sl2vl (null) + +# QoS CA options +qos_ca_max_vls 0 +qos_ca_high_limit -1 +qos_ca_vlarb_high (null) +qos_ca_vlarb_low (null) +qos_ca_sl2vl (null) + +# QoS Switch Port 0 options +qos_sw0_max_vls 0 +qos_sw0_high_limit -1 +qos_sw0_vlarb_high (null) +qos_sw0_vlarb_low (null) +qos_sw0_sl2vl (null) + +# QoS Switch external ports options +qos_swe_max_vls 0 +qos_swe_high_limit -1 +qos_swe_vlarb_high (null) +qos_swe_vlarb_low (null) +qos_swe_sl2vl (null) + +# QoS Router ports options +qos_rtr_max_vls 0 +qos_rtr_high_limit -1 +qos_rtr_vlarb_high (null) +qos_rtr_vlarb_low (null) +qos_rtr_sl2vl (null) + +# Prefix routes file name +prefix_routes_file /etc/ofed/prefix-routes.conf + +# +# IPv6 Solicited Node Multicast (SNM) Options +# +consolidate_ipv6_snm_req FALSE diff --git a/opensm.initd b/opensm.initd index c84a05b..9a1f45d 100644 --- a/opensm.initd +++ b/opensm.initd @@ -4,12 +4,12 @@ # # chkconfig: - 15 85 # description: Activates/Deactivates InfiniBand Subnet Manager -# config: /etc/rdma/opensm.conf +# config: /etc/ofed/opensm.conf # ### BEGIN INIT INFO # Provides: opensm # Default-Stop: 0 1 2 3 4 5 6 -# Required-Start: $rdma +# Required-Start: $openib # Short-Description: Starts/Stops the InfiniBand Subnet Manager # Description: Starts/Stops the InfiniBand Subnet Manager ### END INIT INFO @@ -17,24 +17,17 @@ . /etc/rc.d/init.d/functions prog=/usr/sbin/opensm -CONFIG=/etc/rdma/opensm.conf PID_FILE=/var/run/opensm.pid ACTION=$1 start() { local OSM_PID= - if [ ! -f $CONFIG ]; then - echo -n "Starting opensm: $CONFIG missing" - echo_failure - return 6 - fi - . $CONFIG [ -f /var/lock/subsys/opensm ] && return 0 # Start opensm echo -n "Starting IB Subnet Manager:" - $prog $OPTIONS > /dev/null 2>&1 - sleep 1 + $prog -B > /dev/null 2>&1 + sleep 1 OSM_PID=`pidof $prog` checkpid $OSM_PID RC=$? @@ -53,7 +46,7 @@ stop() OSM_PID=`cat $PID_FILE` - checkpid "$OSM_PID" + checkpid $OSM_PID RC=$? if [ $RC -ne 0 ]; then rm -f $PID_FILE diff --git a/opensm.spec b/opensm.spec index 58e531c..83475a9 100644 --- a/opensm.spec +++ b/opensm.spec @@ -1,6 +1,6 @@ Name: opensm -Version: 3.2.1 -Release: 3%{?dist} +Version: 3.3.1 +Release: 1%{?dist} Summary: OpenIB InfiniBand Subnet Manager and management utilities Group: System Environment/Daemons License: GPLv2 or BSD @@ -9,10 +9,9 @@ Source0: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar. Source1: opensm.conf Source2: opensm.logrotate Source3: opensm.initd -Patch0: opensm-3.2.1-rpath.patch Patch1: opensm-3.2.1-elif.patch BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) -BuildRequires: libibmad-devel >= 1.2.0, libtool, bison, flex, byacc +BuildRequires: libibmad-devel >= 1.3.0, libtool, bison, flex, byacc Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma %description @@ -47,9 +46,7 @@ Static version of opensm libraries %prep %setup -q -%patch0 -p1 -b .rpath %patch1 -p1 -b .elif -./autogen.sh %build %configure --with-opensm-conf-sub-dir=rdma @@ -60,6 +57,7 @@ rm -rf $RPM_BUILD_ROOT make install DESTDIR=$RPM_BUILD_ROOT # remove unpackaged files from the buildroot rm -f $RPM_BUILD_ROOT%{_libdir}/*.la +rm -fr $RPM_BUILD_ROOT%{_sysconfdir}/init.d install -D -m644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/rdma/opensm.conf install -D -m644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/logrotate.d/opensm install -D -m755 %{SOURCE3} $RPM_BUILD_ROOT%{_initrddir}/opensm @@ -110,6 +108,9 @@ fi %{_libdir}/lib*.a %changelog +* Wed Apr 22 2009 Doug Ledford - 3.3.1-1 +- Update to latest upstream version + * Fri Mar 06 2009 Caolán McNamara - 3.2.1-3 - fix bare elifs to rebuild diff --git a/sources b/sources index 4ae143f..9ae0598 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -997d10f81896a0d70e0f21f0e78eca92 opensm-3.2.1.tar.gz +8c8c153f21d9f6cee51fc3d501c54fe7 opensm-3.3.1.tar.gz