From fc35b4ac6e0baa45a5091edc61dca158fdcac899 Mon Sep 17 00:00:00 2001 From: Doug Ledford Date: Mar 16 2016 14:11:23 +0000 Subject: Update to latest upstream release Signed-off-by: Doug Ledford --- diff --git a/.gitignore b/.gitignore index 67344df..fb1b401 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,14 @@ +i386/ +i686/ +x86_64/ +ppc/ +ppc64/ +ia64/ +mips/ +arm*/ +noarch/ +.project +*.src.rpm +.build*.log /opensm-3.*.tar.gz +/opensm-3.*/ diff --git a/opensm-3.3.18-man-fixes.patch b/opensm-3.3.18-man-fixes.patch new file mode 100644 index 0000000..29ba314 --- /dev/null +++ b/opensm-3.3.18-man-fixes.patch @@ -0,0 +1,78 @@ +diff -up opensm-3.3.18/man/opensm.8.in.options opensm-3.3.18/man/opensm.8.in +--- opensm-3.3.18/man/opensm.8.in.options 2014-10-17 13:14:58.462550601 -0400 ++++ opensm-3.3.18/man/opensm.8.in 2014-10-17 13:22:19.587173079 -0400 +@@ -7,14 +7,14 @@ opensm \- InfiniBand subnet manager and + .B opensm + [\-\-version]] + [\-F | \-\-config ] +-[\-c(reate-config) ] +-[\-g(uid) ] +-[\-l(mc) ] +-[\-p(riority) ] ++[\-c | \-\-create-config ] ++[\-g | \-\-guid ] ++[\-l | \-\-lmc ] ++[\-p | \-\-priority ] + [\-\-subnet_prefix ] + [\-\-smkey ] + [\-\-sm_sl ] +-[\-r(eassign_lids)] ++[\-r | \-\-reassign_lids] + [\-R | \-\-routing_engine ] + [\-\-do_mesh_analysis] + [\-\-lash_start_vl ] +@@ -31,20 +31,21 @@ opensm \- InfiniBand subnet manager and + [\-H | \-\-max_reverse_hops ] + [\-X | \-\-guid_routing_order_file ] + [\-m | \-\-ids_guid_file ] +-[\-o(nce)] +-[\-s(weep) ] +-[\-t(imeout) ] ++[\-o | \-\-once] ++[\-s | \-\-sweep ] ++[\-t | \-\-timeout ] + [\-\-retries ] + [\-\-maxsmps ] + [\-\-console [off | local | socket | loopback]] + [\-\-console-port ] +-[\-i(gnore-guids) ] ++[\-i | \-\-ignore-guids ] + [\-w | \-\-hop_weights_file ] + [\-O | \-\-port_search_ordering_file ] + [\-O | \-\-dimn_ports_file ] (DEPRECATED) +-[\-f | \-\-log_file ] +-[\-L | \-\-log_limit ] [\-e(rase_log_file)] +-[\-P(config) ] ++[\-f | \-\-log_file ] ++[\-L | \-\-log_limit ] ++[\-e | \-\-erase_log_file] ++[\-P | \-\-Pconfig ] + [\-N | \-\-no_part_enforce] (DEPRECATED) + [\-Z | \-\-part_enforce [both | in | out | off]] + [\-W | \-\-allow_both_pkeys] +@@ -61,8 +62,11 @@ opensm \- InfiniBand subnet manager and + [\-\-consolidate_ipv6_snm_req] + [\-\-log_prefix ] + [\-\-torus_config ] +-[\-v(erbose)] [\-V] [\-D ] [\-d(ebug) ] +-[\-h(elp)] [\-?] ++[\-v | \-\-verbose] ++[\-V] ++[\-D ] ++[\-d | \-\-debug ] ++[\-h | \-? | \-\-help] + + .SH DESCRIPTION + .PP +@@ -511,10 +515,7 @@ option to enable as follows: + -d2 - Force log flushing after each log message + -d3 - Disable multicast support + .TP +-\fB\-h\fR, \fB\-\-help\fR +-Display this usage info then exit. +-.TP +-\fB\-?\fR ++\fB\-h\fR, \fB\-\-help\fR, \fB\-?\fR + Display this usage info then exit. + + .SH ENVIRONMENT VARIABLES diff --git a/opensm.partitions b/opensm.partitions new file mode 100644 index 0000000..cd07927 --- /dev/null +++ b/opensm.partitions @@ -0,0 +1,74 @@ +# For reference: +# IPv4 IANA reserved multicast addresses: +# http://www.iana.org/assignments/multicast-addresses/multicast-addresses.txt +# IPv6 IANA reserved multicast addresses: +# http://www.iana.org/assignments/ipv6-multicast-addresses/ipv6-multicast-addresses.xml +# +# mtu = +# 1 = 256 +# 2 = 512 +# 3 = 1024 +# 4 = 2048 +# 5 = 4096 +# +# rate = +# 2 = 2.5 GBit/s (SDR 1x) +# 3 = 10 GBit/s (SDR 4x/QDR 1x) +# 4 = 30 GBit/s (SDR 12x) +# 5 = 5 GBit/s (DDR 1x) +# 6 = 20 GBit/s (DDR 4x) +# 7 = 40 GBit/s (QDR 4x) +# 8 = 60 GBit/s (DDR 12x) +# 9 = 80 GBit/s (QDR 8x) +# 10 = 120 GBit/s (QDR 12x) +# If ExtendedLinkSpeeds are supported, then these rate values are valid too +# 11 = 14 GBit/s (FDR 1x) +# 12 = 56 GBit/s (FDR 4x) +# 13 = 112 GBit/s (FDR 8x) +# 14 = 168 GBit/s (FDR 12x) +# 15 = 25 GBit/s (EDR 1x) +# 16 = 100 GBit/s (EDR 4x) +# 17 = 200 GBit/s (EDR 8x) +# 18 = 300 GBit/s (EDR 12x) + +Default=0x7fff, rate=3 mtu=4 scope=2, defmember=full: + ALL, ALL_SWITCHES=full; +Default=0x7fff, ipoib, rate=3 mtu=4 scope=2: + mgid=ff12:401b::ffff:ffff # IPv4 Broadcast address + mgid=ff12:401b::1 # IPv4 All Hosts group + mgid=ff12:401b::2 # IPv4 All Routers group + mgid=ff12:401b::16 # IPv4 IGMP group + mgid=ff12:401b::fb # IPv4 mDNS group + mgid=ff12:401b::fc # IPv4 Multicast Link Local Name Resolution group + mgid=ff12:401b::101 # IPv4 NTP group + mgid=ff12:401b::202 # IPv4 Sun RPC + mgid=ff12:601b::1 # IPv6 All Hosts group + mgid=ff12:601b::2 # IPv6 All Routers group + mgid=ff12:601b::16 # IPv6 MLDv2-capable Routers group + mgid=ff12:601b::fb # IPv6 mDNS group + mgid=ff12:601b::101 # IPv6 NTP group + mgid=ff12:601b::202 # IPv6 Sun RPC group + mgid=ff12:601b::1:3 # IPv6 Multicast Link Local Name Resolution group + ALL=full, ALL_SWITCHES=full; + +# 40GBit, 4K MTU IPoIB example +#ib0_2=0x0002, rate=7 mtu=5 scope=2, defmember=full: +# ALL, ALL_SWITCHES=full; +#ib0_2=0x0002, ipoib, rate=7 mtu=5 scope=2: +# mgid=ff12:401b::ffff:ffff # IPv4 Broadcast address +# mgid=ff12:401b::1 # IPv4 All Hosts group +# mgid=ff12:401b::2 # IPv4 All Routers group +# mgid=ff12:401b::16 # IPv4 IGMP group +# mgid=ff12:401b::fb # IPv4 mDNS group +# mgid=ff12:401b::fc # IPv4 Multicast Link Local Name Resolution group +# mgid=ff12:401b::101 # IPv4 NTP group +# mgid=ff12:401b::202 # IPv4 Sun RPC +# mgid=ff12:601b::1 # IPv6 All Hosts group +# mgid=ff12:601b::2 # IPv6 All Routers group +# mgid=ff12:601b::16 # IPv6 MLDv2-capable Routers group +# mgid=ff12:601b::fb # IPv6 mDNS group +# mgid=ff12:601b::101 # IPv6 NTP group +# mgid=ff12:601b::202 # IPv6 Sun RPC group +# mgid=ff12:601b::1:3 # IPv6 Multicast Link Local Name Resolution group +# ALL=full, ALL_SWITCHES=full; + diff --git a/opensm.spec b/opensm.spec index 52bed01..5da8fb6 100644 --- a/opensm.spec +++ b/opensm.spec @@ -1,20 +1,28 @@ +%global __remake_config 0 +%define _hardened_build 1 + Name: opensm -Version: 3.3.17 -Release: 6%{?dist} +Version: 3.3.19 +Release: 1%{?dist} Summary: OpenIB InfiniBand Subnet Manager and management utilities Group: System Environment/Daemons License: GPLv2 or BSD -Url: http://www.openfabrics.org/ +Url: https://www.openfabrics.org/ -Source0: http://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz +Source0: https://www.openfabrics.org/downloads/management/%{name}-%{version}.tar.gz Source2: opensm.logrotate Source4: opensm.sysconfig Source5: opensm.service Source6: opensm.launch Source7: opensm.rwtab +Source8: opensm.partitions Patch0: opensm-3.3.17-prefix.patch +Patch1: opensm-3.3.18-man-fixes.patch -BuildRequires: libibmad-devel >= 1.3.9, libtool, bison, flex, byacc, systemd +BuildRequires: libibmad-devel >= 1.3.12, systemd, systemd-units +%if %{__remake_config} +BuildRequires: libtool, autoconf, autoheader, bison, flex, byacc +%endif Requires: %{name}-libs%{?_isa} = %{version}-%{release}, logrotate, rdma Requires(post): systemd Requires(preun): systemd @@ -56,7 +64,10 @@ Static version of opensm libraries %patch0 -p1 -b .prefix %build -%configure --with-opensm-conf-sub-dir=rdma +%if %{__remake_config} +./autogen.sh +%endif +%configure --with-opensm-conf-sub-dir=rdma CFLAGS="$CFLAGS -fno-strict-aliasing" make %{?_smp_mflags} cd opensm ./opensm -c ../opensm-%{version}.conf @@ -72,6 +83,7 @@ install -D -m644 %{SOURCE4} %{buildroot}%{_sysconfdir}/sysconfig/opensm install -D -m644 %{SOURCE5} %{buildroot}%{_unitdir}/opensm.service install -D -m755 %{SOURCE6} %{buildroot}%{_libexecdir}/opensm-launch install -D -m644 %{SOURCE7} %{buildroot}%{_sysconfdir}/rwtab.d/opensm +install -D -m644 %{SOURCE8} %{buildroot}%{_sysconfdir}/rdma/partitions.conf mkdir -p ${RPM_BUILD_ROOT}/var/cache/opensm %post @@ -103,6 +115,7 @@ fi %{_libexecdir}/* %config(noreplace) %{_sysconfdir}/logrotate.d/opensm %config(noreplace) %{_sysconfdir}/rdma/opensm.conf +%config(noreplace) %{_sysconfdir}/rdma/partitions.conf %config(noreplace) %{_sysconfdir}/sysconfig/opensm %{_sysconfdir}/rwtab.d/opensm %doc AUTHORS COPYING ChangeLog INSTALL README NEWS @@ -118,6 +131,11 @@ fi %{_libdir}/lib*.a %changelog +* Wed Mar 16 2016 Doug Ledford - 3.3.19-1 +- Update to latest upstream release +- Incorporate features from RHEL opensm +- Resolves: bz1124202 + * Thu Feb 04 2016 Fedora Release Engineering - 3.3.17-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild diff --git a/sources b/sources index 43714bd..2a5c7a6 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -9c1b85e47ab495110c1944e0f4d634b7 opensm-3.3.17.tar.gz +b41a64985fc3050b934ce6082cbac1be opensm-3.3.19.tar.gz