* [gentoo-commits] dev/bircoph:master commit in: sys-infiniband/opensm/, sys-infiniband/opensm/files/
@ 2014-12-27 12:35 Andrew Savchenko
0 siblings, 0 replies; only message in thread
From: Andrew Savchenko @ 2014-12-27 12:35 UTC (permalink / raw
To: gentoo-commits
commit: ea9258e1cf7941c35f3cdbe253cc276c62266321
Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
AuthorDate: Sat Dec 27 12:34:54 2014 +0000
Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com>
CommitDate: Sat Dec 27 12:34:54 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=dev/bircoph.git;a=commit;h=ea9258e1
opensm: fix bug 533676
Add sldd daemon.
---
sys-infiniband/opensm/Manifest | 10 +++++++--
.../opensm/files/opensm-3.3.17-sldd.patch | 20 +++++++++++++++++
sys-infiniband/opensm/files/sldd.conf.d | 21 +++++++++++++++++
sys-infiniband/opensm/files/sldd.init.d | 26 ++++++++++++++++++++++
sys-infiniband/opensm/metadata.xml | 3 +++
sys-infiniband/opensm/opensm-3.3.17.ebuild | 14 ++++++++++--
6 files changed, 90 insertions(+), 4 deletions(-)
diff --git a/sys-infiniband/opensm/Manifest b/sys-infiniband/opensm/Manifest
index d32883c..3d37061 100644
--- a/sys-infiniband/opensm/Manifest
+++ b/sys-infiniband/opensm/Manifest
@@ -1,7 +1,13 @@
AUX opensm-3.3.17-norpm.patch 1613 SHA256 f9e73bfd04442f94228028ecbf0f65b49724dea82f9840a196c7790a1b4f0739 SHA512 6728f0463765f95dce6c04cb0c12460050914b56146105c31f5ed4a69de9351c704f02421073843024a01d733eaecd042549eb6b69bb50556b353c2dbc11819f WHIRLPOOL 3d6c3f3b70114474160af0406759a66529f786713568b73f65b86d6c2e8341dce3ef192681f0d14aa5c92838ecd94e3ded66df00d92df523af56a406e987ffb9
+AUX opensm-3.3.17-sldd.patch 541 SHA256 ba2b81c50fe655303b81d065e2aa8ac8688bc7ef2ef363ff7bd936cfbb79e8f5 SHA512 9125578de137f99cb7efbeb9d6f28a415fb0ec4fa8bd25332ea9844470db126e8b5d04bc67f659bc1bd656049311f766fb1d384110de642f8f6f0269e205f602 WHIRLPOOL bafacd91502b308e0fc24653f15524978371c88bb538ceb6882d66f91295b0ca505392352491b32a35c99d2736dd4e85f9fafea3b4c18fb85d4484898a95e9eb
AUX opensm.conf.d 75 SHA256 9b0999f647f78651ac759a1c6fc9e2648bb5fdb2f4290e32eec6f971b8591b5a SHA512 19f03452eff5134a594a95eeef9397d7b2bf17ce8da9123f7f85a4bc924bc6762db119cbdbf5bd7f91f618acbf08d7e3e4097424bce5d4ba1f5789ec94cd2be2 WHIRLPOOL 86ad8d24aa24c1f974451835aa56d4c60415e6b28f95690f250ba948f52ac06327ce852d2e52e0f8324172169950bdc76df421e3de76a951e01f1490108766a2
AUX opensm.init.d 636 SHA256 84a1bfda6dd13a69a5e30ec4ef0219f9e9ea1801d67eb80a02045671dcc5fbee SHA512 6c907ee9717bf7ecd222db37b938529b5d7f8ab5aa9f3e4c0c3fc6265abbdbcb4e08d9875b0dce0a57bde7af22dd3a6f8102400b12b845b626d340a1b03ed00c WHIRLPOOL e534c5377aa8e23a566388387296435f6b09cfa103bea5376f571d30ab10f83f45891886810652a805a64dd2d5231068233865bed3baeaaf6ef2e3b7649dc39a
+AUX sldd.conf.d 459 SHA256 c032c53111700a70c52145073bacef96be08ac3fb170ceeecdfdb1209cc9b9ab SHA512 d68dd5839db3f193a05f47aaa77d281134a370385c7235b59ac079d9dbc65fbe3292beb82f60a49239d1a308ac384bc7fd71ce5d2ecf5c9b29a182280cf18a35 WHIRLPOOL e776552768070b21d38005714d0605c0fbe2cd014a81db82497e15abd7e93f9311dd59e9df2ecb92ea4d8152144737932db41073aab0303df8aad25c2c4077ca
+AUX sldd.init.d 625 SHA256 e454c50026484c01bb7d829c479a93c4a0fe343b9e03ae1b0904aa114411ba90 SHA512 a8b3dafc3d2fbc04115f8c4a3d63d4bd633c5d3045c2cb82aa920985b4d7c9b6aae3e5002f5bc8f2febb7c547c6306ffbc08c3131c2a69e15e60043c28477416 WHIRLPOOL 508bd9c8e2afb323481dc2d73d788681fbafa8154da4abb76563f26c93e2706215e9c016d8c45ccf242d3d30870a42946ba80997d9e3806cc99866c9e5c0d098
DIST OFED-3.12-rc1.tgz 22055476 SHA256 14ca8a2b0d68e3ee9a37f475fa9eecd9a5ffd6055135f9d4d9db8319843a94dc SHA512 9f834d6982ab7e8ab47a8b5c958ab2e4c238ef983e47798e7f06655f69672ea1e996297939b381f26ed8c39552f6e62156173d5ddd2f0a7b6cad6aecdd973944 WHIRLPOOL 5a64b1d952890ea0e72e0ca93654a0fabc8f871475b05fcbe3b214ddfe4836f6b92d4fbc9e0f0d79acfe69d8c8d219b2c467c23654021e23eaf85ae6825ea4a9
-EBUILD opensm-3.3.17.ebuild 1283 SHA256 9b3f2dbcb13a32e0381a95afeb65dbe6a26a82376a7b134cc81fc8fd50ecf87f SHA512 9b6de35ed5ae0bf8d1c145c4002cd8ff7af96d1093631729ed58de54eb0f72a54a128fd69a149c23750dcc20c2de0b9032b8ce226fe71bdbad92396884e5fc9b WHIRLPOOL 4e7f00adb12167174d7995640a2964b2aae493151b0707014ee84783afbc1a0971d4ddd1601bc90bc8b1c55dc6016f983229ea7d66064ad7d30785a2cc630694
+EBUILD opensm-3.3.17.ebuild 1494 SHA256 2108d90fd1344e6b3562f8b3282f12e81de1ffef1f901ba4c4fa78ddefd7f87a SHA512 500c607f846cd108d2cfa939bffd91d7a3709ef1f5cf618cd227600f5617d54d2a666e33dc51157f8c6c0f31856bc49562a0c3d27c65348d971ccfae6508576a WHIRLPOOL a1198056f1bf83dfa17d51aa85ab288003ca6fcd84da0929160df35ad459ddbbc465c80f6cb49789eb2a8be277051cf640b854f42f7e53691b92a4d374748615
MISC ChangeLog 1097 SHA256 62d8b88b45d8cb342df55b1d3eeb2aba3778d04212187b0900986c447aeb8e5e SHA512 ef77004542345c050eff1184e1079c6d331c0631bd431e773a45aa623e6aa689984d9d128092ce693db6f4078f0a43846ae0261f354e978d0be17b4ca6580bab WHIRLPOOL a38e37afaefbdb57a0be2a8b9eaa355a6deed70d932955a9aeeca22f927988a06e41329ceef5b7c425eec1620a0377ed349c907d1d12ed5afb744b850f918233
-MISC metadata.xml 421 SHA256 78b506cf13aff9269660e6e54f6c27e82e8359c52746036c43841feb140907f8 SHA512 fbcf1c5eb846f4a8c6e1b9e0335c0b2e8f497792045690302e8424c254be8537c30e857aeba02c4a5eefba6c03890dae43f16d39b743c0628999f5c0b888766e WHIRLPOOL 4b6ab3e687f5aa20c7b9f3b3608835dbad6d0771df2a1c51b70805e1cec38eb868e89bc8795fe63883a2f2393ed1e023931533dfdc99333a8dab1ca1d3da5d97
+MISC metadata.xml 485 SHA256 d9389b6c1a67fe3b161de43bf88a0bdd99cf24b675aca8821e8d9b2b73fb2469 SHA512 589530e67e4856cf19f75d69c6f79e8977f8111e2fb997e080819a659a26eaf50c3e22e015cafa77fa147a1cb5728ad764cd83cc0aad8eeb1197441b8ada3d7e WHIRLPOOL 6af50fd520084ad3ec457035cd490ee7238c72e2a812850d9a89f2f64297bba0459184a98c974ef68a7097506facb15af96837afe6fe7879fe44e91946a16a88
+MISC metadata.xml.orig 421 SHA256 78b506cf13aff9269660e6e54f6c27e82e8359c52746036c43841feb140907f8 SHA512 fbcf1c5eb846f4a8c6e1b9e0335c0b2e8f497792045690302e8424c254be8537c30e857aeba02c4a5eefba6c03890dae43f16d39b743c0628999f5c0b888766e WHIRLPOOL 4b6ab3e687f5aa20c7b9f3b3608835dbad6d0771df2a1c51b70805e1cec38eb868e89bc8795fe63883a2f2393ed1e023931533dfdc99333a8dab1ca1d3da5d97
+MISC metadata.xml.patch 383 SHA256 91ff98b09e845f52509027a276da68a6461caf966b676de3de634ef7eb958eb3 SHA512 2e8342f01eb4a90010127f82811d3665492fca8ccf042929bc95387fb939872e4716bc776834044d7790096d2fea79e50550aae23878da22c02f9ed1df285e1b WHIRLPOOL dbd8188066614816c916dc6438a309fb362d582b2181041fb8eefa63f96d70a61adf8f7ca907240c7a48bf08a706b2f4d3d33ae2685bd266784ce1ea3a85d898
+MISC opensm-3.3.17.ebuild.orig 1283 SHA256 9b3f2dbcb13a32e0381a95afeb65dbe6a26a82376a7b134cc81fc8fd50ecf87f SHA512 9b6de35ed5ae0bf8d1c145c4002cd8ff7af96d1093631729ed58de54eb0f72a54a128fd69a149c23750dcc20c2de0b9032b8ce226fe71bdbad92396884e5fc9b WHIRLPOOL 4e7f00adb12167174d7995640a2964b2aae493151b0707014ee84783afbc1a0971d4ddd1601bc90bc8b1c55dc6016f983229ea7d66064ad7d30785a2cc630694
diff --git a/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch b/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch
new file mode 100644
index 0000000..d7eb3ec
--- /dev/null
+++ b/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch
@@ -0,0 +1,20 @@
+--- opensm-3.3.17/scripts/sldd.sh.in.orig 2013-02-07 11:46:29.000000000 +0400
++++ opensm-3.3.17/scripts/sldd.sh.in 2014-12-27 04:47:24.488636743 +0300
+@@ -42,7 +42,7 @@
+ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+
+-CONFIG=@sysconfdir@/sysconfig/opensm
++CONFIG=@sysconfdir@/conf.d/sldd
+ if [ -f $CONFIG ]; then
+ . $CONFIG
+ fi
+@@ -57,7 +57,7 @@
+
+ RCP=${RCP:-/usr/bin/scp}
+ RSH=${RSH:-/usr/bin/ssh}
+-IFCONFIG=${IFCONFIG:-'/sbin/ifconfig -a'}
++IFCONFIG=${IFCONFIG:-'/bin/ifconfig -a'}
+
+ declare -i SLDD_DEBUG
+ RESCAN_TIME=${RESCAN_TIME:-60}
diff --git a/sys-infiniband/opensm/files/sldd.conf.d b/sys-infiniband/opensm/files/sldd.conf.d
new file mode 100644
index 0000000..ee0e887
--- /dev/null
+++ b/sys-infiniband/opensm/files/sldd.conf.d
@@ -0,0 +1,21 @@
+# Tho following variables will used for sldd.sh
+#
+# You must setup this for sldd to work
+OSM_HOSTS=""
+
+### Optional variables (defaults are commented out)
+
+# Debug level
+#SLDD_DEBUG="0"
+
+# OpenSM cache files
+#CACHE_FILE="/var/cache/opensm/guid2lid:/var/cache/opensm/guid2mkey:/var/cache/opensm/neighbors"
+
+# System calls
+#PING="ping -w 1 -c 1"
+#RCP="/usr/bin/scp"
+#SSH="/usr/bin/ssh"
+#IFCONFIG="/bin/ifconfig -a"
+
+# Delay between hosts scan
+#RESCAN_TIME="60"
diff --git a/sys-infiniband/opensm/files/sldd.init.d b/sys-infiniband/opensm/files/sldd.init.d
new file mode 100644
index 0000000..371312d
--- /dev/null
+++ b/sys-infiniband/opensm/files/sldd.init.d
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+depend() {
+ need opensm
+ after net # ip net seems to be needed to perform management.
+}
+
+prog=/usr/sbin/sldd.sh
+pidfile=/var/run/sldd.pid
+
+start() {
+ ebegin "Starting Semi-static LID OpenSM Distribution Manager"
+ start-stop-daemon --start --background --pidfile "${pidfile}" \
+ --make-pidfile --wait 500 --exec $prog
+ eend $?
+}
+
+stop() {
+ ebegin "Stopping OpenSM Infiniband Subnet Manager"
+ start-stop-daemon --stop --pidfile "${pidfile}"
+ eend $?
+}
+
diff --git a/sys-infiniband/opensm/metadata.xml b/sys-infiniband/opensm/metadata.xml
index 82f7df3..eb4ecb9 100644
--- a/sys-infiniband/opensm/metadata.xml
+++ b/sys-infiniband/opensm/metadata.xml
@@ -7,4 +7,7 @@ OpenSM provides an implementation for an InfiniBand Subnet Manager and
Administrator. Such a software entity is required to run for in order to
initialize the InfiniBand hardware (at least one per each InfiniBand subnet).
</longdescription>
+<use>
+ <flag name="tools">Install ssld extra tool</flag>
+</use>
</pkgmetadata>
diff --git a/sys-infiniband/opensm/opensm-3.3.17.ebuild b/sys-infiniband/opensm/opensm-3.3.17.ebuild
index 9f7ab4f..b07a2c7 100644
--- a/sys-infiniband/opensm/opensm-3.3.17.ebuild
+++ b/sys-infiniband/opensm/opensm-3.3.17.ebuild
@@ -13,17 +13,21 @@ inherit autotools eutils openib
DESCRIPTION="OpenSM - InfiniBand Subnet Manager and Administration for OpenIB"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE=""
+IUSE="tools"
DEPEND="
sys-infiniband/libibmad:${SLOT}
sys-infiniband/libibumad:${SLOT}"
RDEPEND="$DEPEND
- net-misc/iputils"
+ tools? (
+ net-misc/iputils
+ net-misc/openssh
+ )"
block_other_ofed_versions
src_prepare() {
epatch "${FILESDIR}/${P}-norpm.patch"
+ epatch "${FILESDIR}/${P}-sldd.patch"
eautoreconf
}
@@ -42,6 +46,12 @@ src_install() {
newins "${S}/scripts/opensm.logrotate" opensm
# we dont nee this int script
rm "${ED}/etc/init.d/opensmd" || die "Dropping of upstream initscript failed"
+
+ if use tools; then
+ dosbin scripts/sldd.sh
+ newconfd "${FILESDIR}/sldd.conf.d" sldd
+ newinitd "${FILESDIR}/sldd.init.d" sldd
+ fi
}
pkg_postinst() {
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2014-12-27 12:35 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-12-27 12:35 [gentoo-commits] dev/bircoph:master commit in: sys-infiniband/opensm/, sys-infiniband/opensm/files/ Andrew Savchenko
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox