rpms/opensm
7
0
Fork 0
Code Issues Pull Requests Releases Activity

update 3.3.17-prefix patch

Browse Source
This commit is contained in:
Peter Robinson 2014-03-17 23:17:13 +00:00
parent ebc68d402e
commit b4b107c4c2
2 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
opensm-3.3.13-prefix.patch → opensm-3.3.17-prefix.patch
View File

@ -1,15 +1,14 @@
diff -up opensm-3.3.13/man/opensm.8.in.prefix opensm-3.3.13/man/opensm.8.in --- opensm-3.3.17/man/opensm.8.in.orig 2014-03-17 22:57:54.510928914 +0000
--- opensm-3.3.13/man/opensm.8.in.prefix 2012-02-28 18:27:33.297714661 -0500 +++ opensm-3.3.17/man/opensm.8.in 2014-03-17 22:59:18.885215712 +0000
+++ opensm-3.3.13/man/opensm.8.in 2012-02-28 18:31:00.957696942 -0500 @@ -11,6 +11,7 @@
@@ -11,6 +11,7 @@ opensm \- InfiniBand subnet manager and
[\-g(uid) <GUID in hex>] [\-g(uid) <GUID in hex>]
[\-l(mc) <LMC>] [\-l(mc) <LMC>]
[\-p(riority) <PRIORITY>] [\-p(riority) <PRIORITY>]
+[\-\-subnet_prefix <PREFIX in hex>] +[\-\-subnet_prefix <PREFIX in hex>]
[\-smkey <SM_Key>] [\-\-smkey <SM_Key>]
[\-\-sm_sl <SL number>] [\-\-sm_sl <SL number>]
[\-r(eassign_lids)] [\-r(eassign_lids)]
@@ -130,6 +131,13 @@ This will effect the handover cases, whe @@ -135,6 +136,13 @@
is chosen by priority and GUID. Range goes from 0 is chosen by priority and GUID. Range goes from 0
(default and lowest priority) to 15 (highest). (default and lowest priority) to 15 (highest).
.TP .TP
@ -20,13 +19,12 @@ diff -up opensm-3.3.13/man/opensm.8.in.prefix opensm-3.3.13/man/opensm.8.in
+separate fabrics plugged into different ports to +separate fabrics plugged into different ports to
+have different prefixes or else it won't run. +have different prefixes or else it won't run.
+.TP +.TP
\fB\-smkey\fR <SM_Key value> \fB\-\-smkey\fR <SM_Key value>
This option specifies the SM\'s SM_Key (64 bits). This option specifies the SM\'s SM_Key (64 bits).
This will effect SM authentication. This will effect SM authentication.
diff -up opensm-3.3.13/opensm/main.c.prefix opensm-3.3.13/opensm/main.c --- opensm-3.3.17/opensm/main.c.orig 2014-01-29 20:50:51.000000000 +0000
--- opensm-3.3.13/opensm/main.c.prefix 2012-01-17 08:22:40.000000000 -0500 +++ opensm-3.3.17/opensm/main.c 2014-03-17 22:57:54.513928955 +0000
+++ opensm-3.3.13/opensm/main.c 2012-02-28 18:31:34.224694111 -0500 @@ -160,6 +160,9 @@
@@ -156,6 +156,9 @@ static void show_usage(void)
" This will effect the handover cases, where master\n" " This will effect the handover cases, where master\n"
" is chosen by priority and GUID. Range goes\n" " is chosen by priority and GUID. Range goes\n"
" from 0 (lowest priority) to 15 (highest).\n\n"); " from 0 (lowest priority) to 15 (highest).\n\n");
@ -36,19 +34,19 @@ diff -up opensm-3.3.13/opensm/main.c.prefix opensm-3.3.13/opensm/main.c
printf("--smkey, -k <SM_Key>\n" printf("--smkey, -k <SM_Key>\n"
" This option specifies the SM's SM_Key (64 bits).\n" " This option specifies the SM's SM_Key (64 bits).\n"
" This will effect SM authentication.\n" " This will effect SM authentication.\n"
@@ -607,6 +610,7 @@ int main(int argc, char *argv[]) @@ -654,6 +657,7 @@
{"once", 0, NULL, 'o'}, {"once", 0, NULL, 'o'},
{"reassign_lids", 0, NULL, 'r'}, {"reassign_lids", 0, NULL, 'r'},
{"priority", 1, NULL, 'p'}, {"priority", 1, NULL, 'p'},
+ {"subnet_prefix", 1, NULL, 13}, + {"subnet_prefix", 1, NULL, 15},
{"smkey", 1, NULL, 'k'}, {"smkey", 1, NULL, 'k'},
{"routing_engine", 1, NULL, 'R'}, {"routing_engine", 1, NULL, 'R'},
{"ucast_cache", 0, NULL, 'A'}, {"ucast_cache", 0, NULL, 'A'},
@@ -911,6 +915,11 @@ int main(int argc, char *argv[]) @@ -996,6 +1000,11 @@
printf(" Priority = %d\n", temp); printf(" Priority = %d\n", temp);
break; break;
+ case 13: + case 15:
+ opt.subnet_prefix = cl_hton64(strtoull(optarg, NULL, 16)); + opt.subnet_prefix = cl_hton64(strtoull(optarg, NULL, 16));
+ printf(" Subnet_Prefix = <0x%" PRIx64 ">\n", cl_hton64(opt.subnet_prefix)); + printf(" Subnet_Prefix = <0x%" PRIx64 ">\n", cl_hton64(opt.subnet_prefix));
+ break; + break;

2
opensm.spec
View File

@ -12,7 +12,7 @@ Source4: opensm.sysconfig
Source5: opensm.service Source5: opensm.service
Source6: opensm.launch Source6: opensm.launch
Source7: opensm.rwtab Source7: opensm.rwtab
Patch0: opensm-3.3.13-prefix.patch Patch0: opensm-3.3.17-prefix.patch
BuildRequires: libibmad-devel = 1.3.9, libtool, bison, flex, byacc, systemd BuildRequires: libibmad-devel = 1.3.9, libtool, bison, flex, byacc, systemd
Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma Requires: %{name}-libs = %{version}-%{release}, logrotate, rdma