Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Andrew Savchenko (bircoph)" <bircoph@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-infiniband/opensm/files: sldd.conf.d sldd.init.d opensm-3.3.17-norpm.patch opensm.conf.d opensm.init.d opensm-3.3.17-sldd.patch
Date: Wed, 11 Feb 2015 04:45:48
Message-Id: 20150211044541.5557F1180D@oystercatcher.gentoo.org
1 bircoph 15/02/11 04:45:41
2
3 Modified: opensm.init.d
4 Added: sldd.conf.d sldd.init.d opensm-3.3.17-norpm.patch
5 opensm.conf.d opensm-3.3.17-sldd.patch
6 Log:
7 Fix bugs 387623, 531980, 533676.
8
9 Signed-off-by: Andrew Savchenko <bircoph@g.o>
10 (Portage version: 2.2.15/cvs/Linux i686, signed Manifest commit with key 565953B95372756C)
11
12 Revision Changes Path
13 1.3 sys-infiniband/opensm/files/opensm.init.d
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d?rev=1.3&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d?rev=1.3&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d?r1=1.2&r2=1.3
18
19 Index: opensm.init.d
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d,v
22 retrieving revision 1.2
23 retrieving revision 1.3
24 diff -u -r1.2 -r1.3
25 --- opensm.init.d 18 Apr 2012 16:45:30 -0000 1.2
26 +++ opensm.init.d 11 Feb 2015 04:45:41 -0000 1.3
27 @@ -1,7 +1,7 @@
28 #!/sbin/runscript
29 -# Copyright 1999-2012 Gentoo Foundation
30 +# Copyright 1999-2015 Gentoo Foundation
31 # Distributed under the terms of the GNU General Public License v2
32 -# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d,v 1.2 2012/04/18 16:45:30 alexxy Exp $
33 +# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d,v 1.3 2015/02/11 04:45:41 bircoph Exp $
34
35 depend() {
36 need openib
37 @@ -12,7 +12,7 @@
38
39 start() {
40 ebegin "Starting OpenSM Infiniband Subnet Manager"
41 - start-stop-daemon --start --background --exec $prog -- $OPTIONS
42 + start-stop-daemon --start --background --exec $prog -- $OSM_OPTIONS
43 eend $?
44 }
45
46
47
48
49 1.1 sys-infiniband/opensm/files/sldd.conf.d
50
51 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/sldd.conf.d?rev=1.1&view=markup
52 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/sldd.conf.d?rev=1.1&content-type=text/plain
53
54 Index: sldd.conf.d
55 ===================================================================
56 # Tho following variables will used for sldd.sh
57 #
58 # You must setup this for sldd to work
59 OSM_HOSTS=""
60
61 ### Optional variables (defaults are commented out)
62
63 # Debug level
64 #SLDD_DEBUG="0"
65
66 # OpenSM cache files
67 #CACHE_FILE="/var/cache/opensm/guid2lid:/var/cache/opensm/guid2mkey:/var/cache/opensm/neighbors"
68
69 # System calls
70 #PING="ping -w 1 -c 1"
71 #RCP="/usr/bin/scp"
72 #SSH="/usr/bin/ssh"
73 #IFCONFIG="/bin/ifconfig -a"
74
75 # Delay between hosts scan
76 #RESCAN_TIME="60"
77
78
79
80 1.1 sys-infiniband/opensm/files/sldd.init.d
81
82 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/sldd.init.d?rev=1.1&view=markup
83 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/sldd.init.d?rev=1.1&content-type=text/plain
84
85 Index: sldd.init.d
86 ===================================================================
87 #!/sbin/runscript
88 # Copyright 1999-2015 Gentoo Foundation
89 # Distributed under the terms of the GNU General Public License v2
90 # $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/files/sldd.init.d,v 1.1 2015/02/11 04:45:41 bircoph Exp $
91
92 depend() {
93 need opensm
94 after net # ip net seems to be needed to perform management.
95 }
96
97 prog=/usr/sbin/sldd.sh
98 pidfile=/var/run/sldd.pid
99
100 start() {
101 ebegin "Starting Semi-static LID OpenSM Distribution Manager"
102 start-stop-daemon --start --background --pidfile "${pidfile}" \
103 --make-pidfile --wait 500 --exec $prog
104 eend $?
105 }
106
107 stop() {
108 ebegin "Stopping OpenSM Infiniband Subnet Manager"
109 start-stop-daemon --stop --pidfile "${pidfile}"
110 eend $?
111 }
112
113
114
115
116 1.1 sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch
117
118 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch?rev=1.1&view=markup
119 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch?rev=1.1&content-type=text/plain
120
121 Index: opensm-3.3.17-norpm.patch
122 ===================================================================
123 --- opensm-3.3.17/configure.in.orig 2014-01-30 23:13:35.000000000 +0400
124 +++ opensm-3.3.17/configure.in 2014-12-27 02:48:11.264876067 +0300
125 @@ -17,11 +17,7 @@
126 [name of the RDMA service: "rdma" when using /etc/init.d/rdma to start RDMA services; "openibd" when using /etc/init.d/openibd to start RDMA services [default=${default_rdma_service}]]))
127 AC_SUBST(RDMA_SERVICE, ${with_rdma_service:-${default_rdma_service}})
128
129 -if { rpm -q sles-release || rpm -q openSUSE-release; } >/dev/null 2>&1; then
130 - default_stop="0 1 4 6"
131 -else
132 - default_stop="0 1 6"
133 -fi
134 +default_stop="0 1 6"
135
136 default_start="null"
137
138 @@ -282,4 +278,4 @@
139 AC_CONFIG_FILES([man/opensm.8 man/torus-2QoS.8 man/torus-2QoS.conf.5 scripts/opensm.init scripts/redhat-opensm.init scripts/sldd.sh])
140
141 dnl Create the following Makefiles
142 -AC_OUTPUT([include/opensm/osm_version.h Makefile include/Makefile complib/Makefile libvendor/Makefile opensm/Makefile osmeventplugin/Makefile osmtest/Makefile opensm.spec])
143 +AC_OUTPUT([include/opensm/osm_version.h Makefile include/Makefile complib/Makefile libvendor/Makefile opensm/Makefile osmeventplugin/Makefile osmtest/Makefile])
144 --- opensm-3.3.17/Makefile.am.orig 2013-02-07 11:46:28.000000000 +0400
145 +++ opensm-3.3.17/Makefile.am 2014-12-27 02:48:45.133654187 +0300
146 @@ -19,7 +19,7 @@
147 doc/partition-config.txt doc/opensm-sriov.txt \
148 doc/opensm_release_notes-3.3.txt
149
150 -EXTRA_DIST = autogen.sh opensm.spec $(various_scripts) $(man_MANS) $(docs)
151 +EXTRA_DIST = autogen.sh $(various_scripts) $(man_MANS) $(docs)
152
153 dist-hook: $(EXTRA_DIST)
154 if [ -x $(top_srcdir)/gen_chlog.sh ] ; then \
155
156
157
158 1.1 sys-infiniband/opensm/files/opensm.conf.d
159
160 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm.conf.d?rev=1.1&view=markup
161 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm.conf.d?rev=1.1&content-type=text/plain
162
163 Index: opensm.conf.d
164 ===================================================================
165 # Provide OpenSM options here.
166 # See man opensm for details
167 OSM_OPTIONS=""
168
169
170
171 1.1 sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch
172
173 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch?rev=1.1&view=markup
174 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch?rev=1.1&content-type=text/plain
175
176 Index: opensm-3.3.17-sldd.patch
177 ===================================================================
178 --- opensm-3.3.17/scripts/sldd.sh.in.orig 2013-02-07 11:46:29.000000000 +0400
179 +++ opensm-3.3.17/scripts/sldd.sh.in 2014-12-27 04:47:24.488636743 +0300
180 @@ -42,7 +42,7 @@
181 prefix=@prefix@
182 exec_prefix=@exec_prefix@
183
184 -CONFIG=@sysconfdir@/sysconfig/opensm
185 +CONFIG=@sysconfdir@/conf.d/sldd
186 if [ -f $CONFIG ]; then
187 . $CONFIG
188 fi
189 @@ -57,7 +57,7 @@
190
191 RCP=${RCP:-/usr/bin/scp}
192 RSH=${RSH:-/usr/bin/ssh}
193 -IFCONFIG=${IFCONFIG:-'/sbin/ifconfig -a'}
194 +IFCONFIG=${IFCONFIG:-'/bin/ifconfig -a'}
195
196 declare -i SLDD_DEBUG
197 RESCAN_TIME=${RESCAN_TIME:-60}
Report Message
Find on MARC Find on Google Groups