[packages/pcp-pmda-infiniband] - new - update patch fixes build with current libibmad

[qboosh]

commit 103592587f72008a8874e6fb4d772bb8fcdee640
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Wed Dec 26 19:48:07 2012 +0100

    - new
    - update patch fixes build with current libibmad

 pcp-pmda-infiniband-update.patch | 25 +++++++++++++++++
 pcp-pmda-infiniband.spec         | 60 ++++++++++++++++++++++++++++++++++++++++
 2 files changed, 85 insertions(+)
---
diff --git a/pcp-pmda-infiniband.spec b/pcp-pmda-infiniband.spec
new file mode 100644
index 0000000..a697e7e
--- /dev/null
+++ b/pcp-pmda-infiniband.spec
@@ -0,0 +1,60 @@
+Summary:	PMDA for collecting statistics from Infiniband HCAs and switches
+Summary(pl.UTF-8):	PMDA do zbierania statystyk z HCA i switchy Infiniband
+Name:		pcp-pmda-infiniband
+Version:	1.0
+Release:	1
+License:	GPL v2+
+Group:		Applications/System
+Source0:	ftp://oss.sgi.com/projects/pcp/download/%{name}-%{version}.tar.bz2
+# Source0-md5:	55f42571dcd057117b670bdd392a9554
+Patch0:		%{name}-update.patch
+URL:		http://oss.sgi.com/projects/pcp/
+BuildRequires:	pcp-devel
+BuildRequires:	libibmad-devel
+BuildRequires:	libibumad-devel
+Requires:	pcp
+BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
+
+%description
+This package contains the PMDA for collecting Infiniband statistics.
+By default it monitors only the local HCAs, but can also be configured
+to monitor remote GUIDs such as IB switches.
+
+%description -l pl.UTF-8
+Ten pakiet zawiera PMDA do zbierania statystyk Infiniband. Domyślnie
+monitoruje tylko lokalne HCA, ale może być także skonfigurowany do
+monitorowania zdalnych GUID-ów, takich jak switche IB.
+
+%prep
+%setup -q
+%patch0 -p1
+
+%build
+%{__make} \
+	CC="%{__cc}" \
+	IBLIBS="-libumad -libmad" \
+	PCFLAGS="%{rpmcflags} -D_GNU_SOURCE"
+
+%install
+rm -rf $RPM_BUILD_ROOT
+
+%{__make} install \
+	PREFIX=$RPM_BUILD_ROOT
+
+%clean
+rm -rf $RPM_BUILD_ROOT
+
+%files
+%defattr(644,root,root,755)
+%dir /var/lib/pcp/pmdas/ib
+%attr(755,root,root) /var/lib/pcp/pmdas/ib/Install
+%attr(755,root,root) /var/lib/pcp/pmdas/ib/Remove
+%attr(755,root,root) /var/lib/pcp/pmdas/ib/pmdaib
+%attr(755,root,root) /var/lib/pcp/pmdas/ib/pmda_ib.so
+/var/lib/pcp/pmdas/ib/domain.h
+/var/lib/pcp/pmdas/ib/help
+/var/lib/pcp/pmdas/ib/help.dir
+/var/lib/pcp/pmdas/ib/help.pag
+/var/lib/pcp/pmdas/ib/pmns
+/var/lib/pcp/pmdas/ib/root
+%{_mandir}/man1/pmdaib.1*
diff --git a/pcp-pmda-infiniband-update.patch b/pcp-pmda-infiniband-update.patch
new file mode 100644
index 0000000..7882023
--- /dev/null
+++ b/pcp-pmda-infiniband-update.patch
@@ -0,0 +1,25 @@
+--- pcp-pmda-infiniband-1.0/src/ib.c.orig	2009-10-19 20:21:09.000000000 +0200
++++ pcp-pmda-infiniband-1.0/src/ib.c	2012-12-26 19:19:28.259246024 +0100
+@@ -626,8 +626,9 @@
+ 		 * actually looking at the particular counter and I'm
+ 		 * trying to minimize resets. */
+ 		memset (pst->perfdata, 0, sizeof (pst->perfdata));
+-		if (!port_performance_query_via (pst->perfdata, &pst->portid,
++		if (!pma_query_via (pst->perfdata, &pst->portid,
+ 						 pst->remport, pst->timeout,
++						 IB_GSI_PORT_COUNTERS,
+ 						 lp->hndl)) {
+ 		    __pmNotifyErr (LOG_ERR,
+ 				   "Cannot get performance counters for %s "
+@@ -868,9 +869,9 @@
+     if (pst->resetmask && (pst->portid.lid != 0)) {
+ 	memset (pst->perfdata, 0, sizeof (pst->perfdata));
+ 
+-	if (port_performance_reset_via (pst->perfdata, &pst->portid, 
++	if (performance_reset_via (pst->perfdata, &pst->portid, 
+ 					pst->remport, pst->resetmask, 
+-					pst->timeout, pst->lport->hndl)) {
++					pst->timeout, IB_GSI_PORT_COUNTERS, pst->lport->hndl)) {
+ 	    int j;
+ 
+ 	    for (j=0; j < ARRAYSZ(mad_cnt_descriptors); j++) {
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pcp-pmda-infiniband.git/commitdiff/103592587f72008a8874e6fb4d772bb8fcdee640