From 6867f4dd12a8a2f07b86754ab07eeb43e48b81f8 Mon Sep 17 00:00:00 2001 From: Ben Allan Date: Fri, 17 Aug 2018 12:14:23 -0600 Subject: [PATCH] update to 3.4.9 this incorporates upstream fixes to lnet_stats sampler and init scripts. --- toss3.unstable/firerpms | 10 +++++----- toss3.unstable/ovis.spec.in | 4 ++++ toss3/firerpms | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/toss3.unstable/firerpms b/toss3.unstable/firerpms index 8cb293c..6c59f33 100755 --- a/toss3.unstable/firerpms +++ b/toss3.unstable/firerpms @@ -1,12 +1,12 @@ -#!/bin/bash -x +#!/bin/bash # # packing=toss3.unstable -ovis_branch=OVIS-3.4.6-dstat-fix +ovis_branch=v3.4.9 sos_branch=master NetworkRequires=github.com #SOSREPO=gitlab@gitlab.opengridcomputing.com:tom/SOS.git -OVISREPO=gitlab@gitlab.opengridcomputing.com:baallan/ovis.git +OVISREPO=gitlab@gitlab.opengridcomputing.com:ovis/ovis.git if test -n "$MODULEPATH"; then module purge @@ -41,7 +41,7 @@ IFACE_OPTS=" --enable-swig --disable-readline --enable-ldms-python ---disable-python +--enable-python --enable-libgenders --enable-genderssystemd " @@ -53,7 +53,7 @@ STORE_OPTS=" --enable-flatfile --enable-csv --enable-store ---disable-rabbitv3 +--enable-rabbitkw " SAMPLER_OPTS=" --disable-cray_power_sampler diff --git a/toss3.unstable/ovis.spec.in b/toss3.unstable/ovis.spec.in index c82b9f3..3bb0ed9 100644 --- a/toss3.unstable/ovis.spec.in +++ b/toss3.unstable/ovis.spec.in @@ -41,6 +41,7 @@ Requires: libevent >= 2.0.21 @ENABLE_LIBGENDERS_TRUE@Requires: genders @ENABLE_SYSCLASSIB_TRUE@Requires: libibmad libibumad @ENABLE_RDMA_TRUE@Requires: librdmacm libibverbs +@ENABLE_RABBITKW_TRUE@Requires: librabbitmq librabbitmq-devel BuildRequires: gettext-devel gcc glib2-devel @ENABLE_DOC_TRUE@BuildRequires: doxygen @@ -53,6 +54,7 @@ BuildRequires: libevent libevent-devel @ENABLE_SWIG_TRUE@BuildRequires: swig @ENABLE_LIBGENDERS_TRUE@BuildRequires: boost-devel @ENABLE_LIBGENDERS_TRUE@BuildRequires: genders +@ENABLE_RABBITKW_TRUE@BuildRequires: librabbitmq librabbitmq-devel Url: http://ovis.ca.sandia.gov/ # relocation prefix0 for file installs other than sysconfdir & localstatedir @@ -463,6 +465,8 @@ bash $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/relocate-paths.sh $RPM_INSTALL_PREFIX0/share/doc/ovis-@VERSION@/relocation/manifest %changelog +* Wed Jul 25 2018 Ben Allan 3.4.8-1 +Config support of store_rabbitkw. * Thu Apr 19 2018 Ben Allan 3.4.6-0 SOS/baler v3 deprecation. Wrapper file for sbin exec relocation support. * Wed Oct 18 2017 Ben Allan 3.4.4-4 diff --git a/toss3/firerpms b/toss3/firerpms index 5c15595..6b16cf2 100755 --- a/toss3/firerpms +++ b/toss3/firerpms @@ -2,7 +2,7 @@ # # packing=toss3 -ovis_branch=v3.4.8 +ovis_branch=v3.4.9 sos_branch=master NetworkRequires=github.com #SOSREPO=gitlab@gitlab.opengridcomputing.com:tom/SOS.git