commit: 037f10da6b849739cd821288cce1341a3e4bdd48 Author: Andrew Savchenko <bircoph <AT> gmail <DOT> com> AuthorDate: Wed Feb 11 04:50:34 2015 +0000 Commit: Andrew Savchenko <bircoph <AT> gmail <DOT> com> CommitDate: Wed Feb 11 04:50:34 2015 +0000 URL: http://sources.gentoo.org/gitweb/?p=dev/bircoph.git;a=commit;h=037f10da
opensm is fixed in tree now. --- profiles/categories | 1 - sys-infiniband/opensm/ChangeLog | 32 ------------ sys-infiniband/opensm/Manifest | 10 ---- .../opensm/files/opensm-3.3.17-norpm.patch | 32 ------------ .../opensm/files/opensm-3.3.17-sldd.patch | 20 ------- sys-infiniband/opensm/files/opensm.conf.d | 3 -- sys-infiniband/opensm/files/opensm.init.d | 24 --------- sys-infiniband/opensm/files/sldd.conf.d | 21 -------- sys-infiniband/opensm/files/sldd.init.d | 26 --------- sys-infiniband/opensm/metadata.xml | 13 ----- sys-infiniband/opensm/opensm-3.3.17.ebuild | 61 ---------------------- 11 files changed, 243 deletions(-) diff --git a/profiles/categories b/profiles/categories index bb7cdb0..2c93c54 100644 --- a/profiles/categories +++ b/profiles/categories @@ -25,7 +25,6 @@ sci-geosciences sys-apps sys-cluster sys-devel -sys-infiniband sys-kernel sys-libs x11-misc diff --git a/sys-infiniband/opensm/ChangeLog b/sys-infiniband/opensm/ChangeLog deleted file mode 100644 index 0d1712f..0000000 --- a/sys-infiniband/opensm/ChangeLog +++ /dev/null @@ -1,32 +0,0 @@ -# ChangeLog for sys-infiniband/opensm -# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/ChangeLog,v 1.6 2014/04/16 08:22:28 alexxy Exp $ - -*opensm-3.3.17 (16 Apr 2014) - - 16 Apr 2014; Alexey Shvetsov <ale...@gentoo.org> +opensm-3.3.17.ebuild, - -opensm-3.3.13.ebuild: - Update ofed stack to 3.12-rc1 - - 13 Oct 2012; Alexey Shvetsov <ale...@gentoo.org> opensm-3.3.15.ebuild: - [sys-infiniband] Update OFED - -*opensm-3.3.15 (12 Oct 2012) - - 12 Oct 2012; Alexey Shvetsov <ale...@gentoo.org> +opensm-3.3.15.ebuild: - [sys-infiniband] OFED 3.5 rc2 update - -*opensm-3.3.13 (18 Apr 2012) - - 18 Apr 2012; Alexey Shvetsov <ale...@gentoo.org> +opensm-3.3.13.ebuild, - -opensm-3.3.9.ebuild, files/opensm.init.d: - [sys-infiniband/opensm] Version bump to OFED 1.5.4.1 - - 02 Jul 2011; Alexey Shvetsov <ale...@gentoo.org> opensm-3.3.9.ebuild: - Add ~amd64-linux keywrod - -*opensm-3.3.9 (30 Jun 2011) - - 30 Jun 2011; Alexey Shvetsov <ale...@gentoo.org> +opensm-3.3.9.ebuild, - +files/opensm.init.d, +metadata.xml: - Initial import to tree diff --git a/sys-infiniband/opensm/Manifest b/sys-infiniband/opensm/Manifest deleted file mode 100644 index d4f280d..0000000 --- a/sys-infiniband/opensm/Manifest +++ /dev/null @@ -1,10 +0,0 @@ -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 1493 SHA256 4cc14fd8ea3f53105b14c1e1a2b28c0a0a91a1ecd661c0ad1e20e613cebcd49c SHA512 ddda2c3d27b6263117a089b6646ea1745a2482c4e91005ca1c98e2043054e45f0c9ebcfd92453d45085e9707454e80d6f776f7b37076fccd646a4d87ccef21f2 WHIRLPOOL efa296629eacbdcdc59a4742ec73b881c8223267a07ae39677764ac563fa945fde012a9b5acbafeeed62ea2ed897c4d868ed937a8b80666f7a18aa5fbf75e77b -MISC ChangeLog 1097 SHA256 7b7d9ac9e1001226de014fd919fd4b70dbd9544426ac27d3e0f76df0a53b5a6c SHA512 e0ed941c1e45c805e7c07a322702225eb7db4189b91eefc9044e84115e66bba44d8d6493db2ca5b8adc160bc331ace052775ef228bfa8530cd2007cdfe4407f2 WHIRLPOOL 23e61a40583edcbb045bd9fa83f1235ed327385d399b282dd6ff57a9cd69cfc7756be7d3ddd69f2d8b264e3acbc14ca4f9b7e4d2fe463b34aabd867879fb71d2 -MISC metadata.xml 485 SHA256 d9389b6c1a67fe3b161de43bf88a0bdd99cf24b675aca8821e8d9b2b73fb2469 SHA512 589530e67e4856cf19f75d69c6f79e8977f8111e2fb997e080819a659a26eaf50c3e22e015cafa77fa147a1cb5728ad764cd83cc0aad8eeb1197441b8ada3d7e WHIRLPOOL 6af50fd520084ad3ec457035cd490ee7238c72e2a812850d9a89f2f64297bba0459184a98c974ef68a7097506facb15af96837afe6fe7879fe44e91946a16a88 diff --git a/sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch b/sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch deleted file mode 100644 index 1300d92..0000000 --- a/sys-infiniband/opensm/files/opensm-3.3.17-norpm.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- opensm-3.3.17/configure.in.orig 2014-01-30 23:13:35.000000000 +0400 -+++ opensm-3.3.17/configure.in 2014-12-27 02:48:11.264876067 +0300 -@@ -17,11 +17,7 @@ - [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}]])) - AC_SUBST(RDMA_SERVICE, ${with_rdma_service:-${default_rdma_service}}) - --if { rpm -q sles-release || rpm -q openSUSE-release; } >/dev/null 2>&1; then -- default_stop="0 1 4 6" --else -- default_stop="0 1 6" --fi -+default_stop="0 1 6" - - default_start="null" - -@@ -282,4 +278,4 @@ - 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]) - - dnl Create the following Makefiles --AC_OUTPUT([include/opensm/osm_version.h Makefile include/Makefile complib/Makefile libvendor/Makefile opensm/Makefile osmeventplugin/Makefile osmtest/Makefile opensm.spec]) -+AC_OUTPUT([include/opensm/osm_version.h Makefile include/Makefile complib/Makefile libvendor/Makefile opensm/Makefile osmeventplugin/Makefile osmtest/Makefile]) ---- opensm-3.3.17/Makefile.am.orig 2013-02-07 11:46:28.000000000 +0400 -+++ opensm-3.3.17/Makefile.am 2014-12-27 02:48:45.133654187 +0300 -@@ -19,7 +19,7 @@ - doc/partition-config.txt doc/opensm-sriov.txt \ - doc/opensm_release_notes-3.3.txt - --EXTRA_DIST = autogen.sh opensm.spec $(various_scripts) $(man_MANS) $(docs) -+EXTRA_DIST = autogen.sh $(various_scripts) $(man_MANS) $(docs) - - dist-hook: $(EXTRA_DIST) - if [ -x $(top_srcdir)/gen_chlog.sh ] ; then \ diff --git a/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch b/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch deleted file mode 100644 index d7eb3ec..0000000 --- a/sys-infiniband/opensm/files/opensm-3.3.17-sldd.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- 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/opensm.conf.d b/sys-infiniband/opensm/files/opensm.conf.d deleted file mode 100644 index 4f0cd49..0000000 --- a/sys-infiniband/opensm/files/opensm.conf.d +++ /dev/null @@ -1,3 +0,0 @@ -# Provide OpenSM options here. -# See man opensm for details -OSM_OPTIONS="" diff --git a/sys-infiniband/opensm/files/opensm.init.d b/sys-infiniband/opensm/files/opensm.init.d deleted file mode 100644 index 8ff8f46..0000000 --- a/sys-infiniband/opensm/files/opensm.init.d +++ /dev/null @@ -1,24 +0,0 @@ -#!/sbin/runscript -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/files/opensm.init.d,v 1.2 2012/04/18 16:45:30 alexxy Exp $ - -depend() { - need openib - after net # ip net seems to be needed to perform management. -} - -prog=/usr/sbin/opensm - -start() { - ebegin "Starting OpenSM Infiniband Subnet Manager" - start-stop-daemon --start --background --exec $prog -- $OSM_OPTIONS - eend $? -} - -stop() { - ebegin "Stopping OpenSM Infiniband Subnet Manager" - start-stop-daemon --stop --exec $prog - eend $? -} - diff --git a/sys-infiniband/opensm/files/sldd.conf.d b/sys-infiniband/opensm/files/sldd.conf.d deleted file mode 100644 index ee0e887..0000000 --- a/sys-infiniband/opensm/files/sldd.conf.d +++ /dev/null @@ -1,21 +0,0 @@ -# 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 deleted file mode 100644 index 371312d..0000000 --- a/sys-infiniband/opensm/files/sldd.init.d +++ /dev/null @@ -1,26 +0,0 @@ -#!/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 deleted file mode 100644 index eb4ecb9..0000000 --- a/sys-infiniband/opensm/metadata.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <herd>cluster</herd> - <longdescription> -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 deleted file mode 100644 index 90c3868..0000000 --- a/sys-infiniband/opensm/opensm-3.3.17.ebuild +++ /dev/null @@ -1,61 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-infiniband/opensm/opensm-3.3.17.ebuild,v 1.1 2014/04/16 08:22:28 alexxy Exp $ - -EAPI="5" - -OFED_VER="3.12" -OFED_RC="1" -OFED_RC_VER="1" -OFED_SUFFIX="1" - -inherit autotools eutils openib - -DESCRIPTION="OpenSM - InfiniBand Subnet Manager and Administration for OpenIB" -KEYWORDS="~amd64 ~x86 ~amd64-linux" -IUSE="tools" - -DEPEND=" - sys-infiniband/libibmad:${SLOT} - sys-infiniband/libibumad:${SLOT}" -RDEPEND="$DEPEND - tools? ( - net-misc/iputils - net-misc/openssh - )" -block_other_ofed_versions - -src_prepare() { - epatch "${FILESDIR}/${P}-norpm.patch" - epatch "${FILESDIR}/${P}-sldd.patch" - eautoreconf -} - -src_configure() { - econf \ - --enable-perf-mgr \ - --enable-default-event-plugin \ - --with-osmv="openib" -} - -src_install() { - default - newconfd "${FILESDIR}/opensm.conf.d" opensm - newinitd "${FILESDIR}/opensm.init.d" opensm - insinto /etc/logrotate.d - 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() { - einfo "To automatically configure the infiniband subnet manager on boot," - einfo "edit /etc/opensm.conf and add opensm to your start-up scripts:" - einfo "\`rc-update add opensm default\`" -}