Mailinglist Archive: opensuse-commit (1306 mails)
| < Previous | Next > |
commit libibmad
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Tue, 03 Jul 2007 15:03:48 +0200
- Message-id: <20070703130348.BC388678182@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package libibmad
checked in at Tue Jul 3 15:03:48 CEST 2007.
--------
--- libibmad/libibmad.changes 2007-06-20 14:06:36.000000000 +0200
+++ /mounts/work_src_done/STABLE/libibmad/libibmad.changes 2007-07-03 12:56:35.000000000 +0200
@@ -1,0 +2,5 @@
+Mon Jul 2 16:40:07 CEST 2007 - hvogel@xxxxxxx
+
+- Use correct version 1.0.5 that comes with OFED 1.2
+
+-------------------------------------------------------------------
Old:
----
libibmad-3.2.0.tar.bz2
New:
----
libibmad-1.0.5.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ libibmad.spec ++++++
--- /var/tmp/diff_new_pack.PZ9248/_old 2007-07-03 15:02:48.000000000 +0200
+++ /var/tmp/diff_new_pack.PZ9248/_new 2007-07-03 15:02:48.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package libibmad (Version 3.2.0)
+# spec file for package libibmad (Version 1.0.5)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -12,9 +12,9 @@
Name: libibmad
Summary: Low layer Infiniband diagnostic and management programs
-Version: 3.2.0
+Version: 1.0.5
Release: 1
-License: BSD License and BSD-like, GNU General Public License (GPL)
+License: BSD 3-Clause, GPL v2 or later
Group: System/Libraries
Source0: %{name}-%{version}.tar.bz2
URL: http://www.openfabrics.porg
@@ -80,5 +80,7 @@
%_libdir/libibmad.so
%changelog
+* Mon Jul 02 2007 - hvogel@xxxxxxx
+- Use correct version 1.0.5 that comes with OFED 1.2
* Wed Jun 20 2007 - hvogel@xxxxxxx
- Initial Package, Version 3.2.0
++++++ libibmad-3.2.0.tar.bz2 -> libibmad-1.0.5.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libibmad-3.2.0/ChangeLog new/libibmad-1.0.5/ChangeLog
--- old/libibmad-3.2.0/ChangeLog 2007-06-20 13:49:50.000000000 +0200
+++ new/libibmad-1.0.5/ChangeLog 2007-07-03 12:48:39.000000000 +0200
@@ -1,16 +1,14 @@
-2007-06-18 Hal Rosenstock <halr@xxxxxxxxxxxx>
+2007-06-02 Hal Rosenstock <halr@xxxxxxxxxxxx>
- * include/infiniband/mad.h, src/fields.c: Change IB_PORT_MTRU_CAP_F
- to IB_PORT_MTU_CAP_F
+ * Relase version 1.0.5.
-2007-06-05 Sasha Khapyorsky <sashak@xxxxxxxxxxxx>
+2007-05-21 Hal Rosenstock <halr@xxxxxxxxxxxx>
- * include/infiniband/mad.h, src/fields.c: Add Notice DataDetails
- fields for DataDetails, and trap 144 LID and CapabilityMask
+ * src/fields.c: Changed PortMulticastPkts to PortMulticastRcvPkts
-2007-05-21 Hal Rosenstock <halr@xxxxxxxxxxxx>
+2007-04-13 Hal Rosenstock <halr@xxxxxxxxxxxx>
- * src/fields.c: Changed PortMulticastPkts to PortMulticastRcvPkts
+ * Release version 1.0.4.
2007-03-29 Hal Rosenstock <halr@xxxxxxxxxxxx>
@@ -18,16 +16,7 @@
2007-03-29 Hal Rosenstock <halr@xxxxxxxxxxxx>
- * Release version 1.1.0.
-
-2007-03-22 Hal Rosenstock <halr@xxxxxxxxxxxx>
-
- * src/mad.c: Implement GRH support in mad_build_pkt
-
- * include/infiniband/mad.h: In ib_portid_set, ensure
- grh_present is 0
-
- * src/portid.c: In portid2str, fix endian of dispay of GID
+ * Release version 1.0.3.
2007-03-14 Hal Rosenstock <halr@xxxxxxxxxxxx>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libibmad-3.2.0/configure.in new/libibmad-1.0.5/configure.in
--- old/libibmad-3.2.0/configure.in 2007-06-20 13:49:50.000000000 +0200
+++ new/libibmad-1.0.5/configure.in 2007-07-03 12:48:39.000000000 +0200
@@ -1,7 +1,7 @@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.57)
-AC_INIT(libibmad, 1.1.0, general@xxxxxxxxxxxxxxxxxxxxx)
+AC_INIT(libibmad, 1.0.5, general@xxxxxxxxxxxxxxxxxxxxx)
AC_CONFIG_SRCDIR([src/sa.c])
AC_CONFIG_AUX_DIR(config)
AM_CONFIG_HEADER(config.h)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libibmad-3.2.0/include/infiniband/mad.h new/libibmad-1.0.5/include/infiniband/mad.h
--- old/libibmad-3.2.0/include/infiniband/mad.h 2007-06-20 13:49:50.000000000 +0200
+++ new/libibmad-1.0.5/include/infiniband/mad.h 2007-07-03 12:48:39.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2007 Voltaire Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
@@ -182,13 +182,13 @@
uint64_t mask; /* for sa mads */
uint recsz; /* for sa mads (attribute offset) */
int timeout;
- uint32_t oui; /* for vendor range 2 mads */
+ uint32_t oui; /* for vendor mads range 2 */
} ib_rpc_t;
typedef struct portid {
int lid; /* lid or 0 if directed route */
ib_dr_path_t drpath;
- int grh_present; /* flag */
+ int grh; /* flag */
ib_gid_t gid;
uint32_t qp;
uint32_t qkey;
@@ -296,7 +296,7 @@
IB_PORT_VL_ARBITRATION_HIGH_CAP_F,
IB_PORT_VL_ARBITRATION_LOW_CAP_F,
IB_PORT_INIT_TYPE_REPLY_F,
- IB_PORT_MTU_CAP_F,
+ IB_PORT_MTRU_CAP_F,
IB_PORT_VL_STALL_COUNT_F,
IB_PORT_HOQ_LIFE_F,
IB_PORT_OPER_VLS_F,
@@ -382,10 +382,7 @@
IB_NOTICE_ISSUER_LID_F,
IB_NOTICE_TOGGLE_F,
IB_NOTICE_COUNT_F,
- IB_NOTICE_DATA_DETAILS_F,
IB_NOTICE_DATA_LID_F,
- IB_NOTICE_DATA_144_LID_F,
- IB_NOTICE_DATA_144_CAPMASK_F,
/*
* GS Performance
@@ -626,7 +623,6 @@
portid->lid = lid;
portid->qp = qp;
portid->qkey = qkey;
- portid->grh_present = 0;
return 0;
}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libibmad-3.2.0/libibmad.spec.in new/libibmad-1.0.5/libibmad.spec.in
--- old/libibmad-3.2.0/libibmad.spec.in 2007-06-20 13:49:50.000000000 +0200
+++ new/libibmad-1.0.5/libibmad.spec.in 2007-07-03 12:48:39.000000000 +0200
@@ -1,19 +1,18 @@
-%define RELEASE @RELEASE@
+%define ver @VERSION@
+%define RELEASE 1
%define rel %{?CUSTOM_RELEASE} %{!?CUSTOM_RELEASE:%RELEASE}
-Summary: OpenFabrics Alliance InfiniBand MAD library
+Summary: OpenIB InfiniBand Management and Diagnostic Tools
Name: libibmad
-Version: @VERSION@
+Version: %ver
Release: %rel%{?dist}
License: GPL/BSD
Group: System Environment/Libraries
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Source: git://git.openfabrics.org/~halr/management/@TARBALL@
-Url: http://openfabrics.org/
-BuildRequires: libibumad-devel, autoconf, libtool, automake
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
+BuildRoot: %{_tmppath}/%{name}-%{version}-root
+Source: http://openib.org/downloads/%{name}-%{version}.tar.gz
+Url: http://openib.org/
+BuildRequires: libibumad-devel
%description
libibmad provides low layer IB functions for use by the IB diagnostic
@@ -24,27 +23,16 @@
Summary: Development files for the libibmad library
Group: System Environment/Libraries
Requires: %{name} = %{version}-%{release} libibumad-devel
-Requires(post): /sbin/ldconfig
-Requires(postun): /sbin/ldconfig
%description devel
Development files for the libibmad library.
-%package static
-Summary: Static version of the libibmad library
-Group: System Environment/Libraries
-Requires: %{name} = %{version}-%{release}
-
-%description static
-Static version of the libibmad library
-
%prep
%setup -q
%build
-./autogen.sh
%configure
-make %{?_smp_mflags}
+make
%install
make DESTDIR=${RPM_BUILD_ROOT} install
@@ -54,11 +42,6 @@
%clean
rm -rf $RPM_BUILD_ROOT
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-%post devel -p /sbin/ldconfig
-%postun devel -p /sbin/ldconfig
-
%files
%defattr(-,root,root)
%{_libdir}/libibmad*.so.*
@@ -66,9 +49,6 @@
%files devel
%defattr(-,root,root)
+%{_libdir}/libibmad.a
%{_libdir}/libibmad.so
%{_includedir}/infiniband/*.h
-
-%files static
-%defattr(-,root,root)
-%{_libdir}/libibmad.a
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libibmad-3.2.0/src/fields.c new/libibmad-1.0.5/src/fields.c
--- old/libibmad-3.2.0/src/fields.c 2007-06-20 13:49:50.000000000 +0200
+++ new/libibmad-1.0.5/src/fields.c 2007-07-03 12:48:39.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2007 Voltaire Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
@@ -140,7 +140,7 @@
[IB_PORT_VL_ARBITRATION_LOW_CAP_F] {BITSOFFS(320, 8), "VLArbLowCap", mad_dump_uint},
[IB_PORT_INIT_TYPE_REPLY_F] {BITSOFFS(328, 4), "InitReply", mad_dump_hex},
- [IB_PORT_MTU_CAP_F] {BITSOFFS(332, 4), "MtuCap", mad_dump_mtu},
+ [IB_PORT_MTRU_CAP_F] {BITSOFFS(332, 4), "MtuCap", mad_dump_mtu},
[IB_PORT_VL_STALL_COUNT_F] {BITSOFFS(336, 3), "VLStallCount", mad_dump_uint},
[IB_PORT_HOQ_LIFE_F] {BITSOFFS(339, 5), "HoqLife", mad_dump_uint},
[IB_PORT_OPER_VLS_F] {BITSOFFS(344, 4), "OperVLs", mad_dump_opervls},
@@ -216,10 +216,7 @@
[IB_NOTICE_ISSUER_LID_F] {BITSOFFS(48, 16), "NoticeIssuerLID", mad_dump_uint},
[IB_NOTICE_TOGGLE_F] {BITSOFFS(64, 1), "NoticeToggle", mad_dump_uint},
[IB_NOTICE_COUNT_F] {BITSOFFS(65, 15), "NoticeCount", mad_dump_uint},
- [IB_NOTICE_DATA_DETAILS_F] {80, 432, "NoticeDataDetails", mad_dump_array},
[IB_NOTICE_DATA_LID_F] {BITSOFFS(80, 16), "NoticeDataLID", mad_dump_uint},
- [IB_NOTICE_DATA_144_LID_F] {BITSOFFS(96, 16), "NoticeDataTrap144LID", mad_dump_uint},
- [IB_NOTICE_DATA_144_CAPMASK_F] {BITSOFFS(128, 32), "NoticeDataTrap144CapMask", mad_dump_uint},
/*
* NodeDescription fields:
@@ -277,8 +274,8 @@
/*
* SA Path rec
*/
- [IB_SA_PR_DGID_F] {64, 128, "PathRecDGid", mad_dump_array},
- [IB_SA_PR_SGID_F] {192, 128, "PathRecSGid", mad_dump_array},
+ [IB_SA_PR_DGID_F] {64,128, "PathRecDGid", mad_dump_array},
+ [IB_SA_PR_SGID_F] {192,128, "PathRecSGid", mad_dump_array},
[IB_SA_PR_DLID_F] {BITSOFFS(320,16), "PathRecDLid", mad_dump_hex},
[IB_SA_PR_SLID_F] {BITSOFFS(336,16), "PathRecSLid", mad_dump_hex},
[IB_SA_PR_NPATH_F] {BITSOFFS(393,7), "PathRecNumPath", mad_dump_uint},
@@ -289,7 +286,7 @@
[IB_SA_MP_NPATH_F] {BITSOFFS(41,7), "MultiPathNumPath", mad_dump_uint},
[IB_SA_MP_NSRC_F] {BITSOFFS(120,8), "MultiPathNumSrc", mad_dump_uint},
[IB_SA_MP_NDEST_F] {BITSOFFS(128,8), "MultiPathNumDest", mad_dump_uint},
- [IB_SA_MP_GID0_F] {192, 128, "MultiPathGid", mad_dump_array},
+ [IB_SA_MP_GID0_F] {192,128, "MultiPathGid", mad_dump_array},
/*
* MC Member rec
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libibmad-3.2.0/src/gs.c new/libibmad-1.0.5/src/gs.c
--- old/libibmad-3.2.0/src/gs.c 2007-06-20 13:49:50.000000000 +0200
+++ new/libibmad-1.0.5/src/gs.c 2007-07-03 12:48:39.000000000 +0200
@@ -159,3 +159,4 @@
{
return pma_query(rcvbuf, dest, port, timeout, IB_GSI_PORT_SAMPLES_RESULT);
}
+
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libibmad-3.2.0/src/mad.c new/libibmad-1.0.5/src/mad.c
--- old/libibmad-3.2.0/src/mad.c 2007-06-20 13:49:50.000000000 +0200
+++ new/libibmad-1.0.5/src/mad.c 2007-07-03 12:48:39.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2007 Voltaire Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
@@ -175,7 +175,6 @@
int lid_routed = rpc->mgtclass != IB_SMI_DIRECT_CLASS;
int is_smi = (rpc->mgtclass == IB_SMI_CLASS ||
rpc->mgtclass == IB_SMI_DIRECT_CLASS);
- struct ib_mad_addr addr;
if (!is_smi)
umad_set_addr(umad, dport->lid, dport->qp, dport->sl, dport->qkey);
@@ -187,15 +186,7 @@
else
umad_set_addr(umad, 0xffff, 0, 0, 0);
- if (dport->grh_present && !is_smi) {
- addr.grh_present = 1;
- memcpy(addr.gid, dport->gid, 16);
- addr.hop_limit = 0xff;
- addr.traffic_class = 0;
- addr.flow_label = 0;
- umad_set_grh(umad, &addr);
- } else
- umad_set_grh(umad, 0);
+ umad_set_grh(umad, (dport->grh && !is_smi) ? 0/*grh*/ : 0); /* FIXME: GRH support */
umad_set_pkey(umad, is_smi ? 0 : dport->pkey_idx);
mad = umad_get_mad(umad);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libibmad-3.2.0/src/portid.c new/libibmad-1.0.5/src/portid.c
--- old/libibmad-3.2.0/src/portid.c 2007-06-20 13:49:50.000000000 +0200
+++ new/libibmad-1.0.5/src/portid.c 2007-07-03 12:48:39.000000000 +0200
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2004-2007 Voltaire Inc. All rights reserved.
+ * Copyright (c) 2004-2006 Voltaire Inc. All rights reserved.
*
* This software is available to you under a choice of one of two
* licenses. You may choose to be licensed under the terms of the GNU
@@ -69,14 +69,14 @@
if (portid->lid > 0) {
s += sprintf(s, "Lid %d", portid->lid);
- if (portid->grh_present) {
+ if (portid->grh) {
#if __WORDSIZE == 64
- s += sprintf(s, " Gid 0x%lx%lx",
+ s += sprintf(s, " Gid %lx%lx",
#else
- s += sprintf(s, " Gid 0x%Lx%Lx",
+ s += sprintf(s, " Gid %Lx%Lx",
#endif
- ntohll(*(uint64_t *)portid->gid),
- ntohll(*(uint64_t *)(portid->gid+8)));
+ *(uint64_t *)portid->gid,
+ *(uint64_t *)(portid->gid+8));
}
if (portid->drpath.cnt)
s += sprintf(s, " ");
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libibmad-3.2.0/src/resolve.c new/libibmad-1.0.5/src/resolve.c
--- old/libibmad-3.2.0/src/resolve.c 2007-06-20 13:49:50.000000000 +0200
+++ new/libibmad-1.0.5/src/resolve.c 2007-07-03 12:48:39.000000000 +0200
@@ -46,6 +46,7 @@
#include <mad.h>
#include <infiniband/common.h>
+
#undef DEBUG
#define DEBUG if (ibdebug) IBWARN
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/libibmad-3.2.0/src/rpc.c new/libibmad-1.0.5/src/rpc.c
--- old/libibmad-3.2.0/src/rpc.c 2007-06-20 13:49:50.000000000 +0200
+++ new/libibmad-1.0.5/src/rpc.c 2007-07-03 12:48:39.000000000 +0200
@@ -394,3 +394,4 @@
port.class_agents[IB_SA_CLASS] = mad_class_agent(IB_SA_CLASS);
return sa_rpc_call(&port, rcvbuf, portid, sa, timeout);
}
+
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |