diff --git a/.dapl.metadata b/.dapl.metadata index 955cc0e..3b5540d 100644 --- a/.dapl.metadata +++ b/.dapl.metadata @@ -1 +1 @@ -4f672aca969cc0f9a9d1c3e26ba53fdd84a253c6 SOURCES/dapl-2.0.39.tar.gz +f5d1a59a0e97efa6e493ecb5a0048030d9972991 SOURCES/dapl-2.1.5.tar.gz diff --git a/.gitignore b/.gitignore index 2d9810b..bd4a7f5 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/dapl-2.0.39.tar.gz +SOURCES/dapl-2.1.5.tar.gz diff --git a/SOURCES/dapl-2.0.25-dat_ia_open_hang.patch b/SOURCES/dapl-2.0.25-dat_ia_open_hang.patch deleted file mode 100644 index 4e5df0e..0000000 --- a/SOURCES/dapl-2.0.25-dat_ia_open_hang.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -up dapl-2.0.32/dapl/openib_cma/device.c.open dapl-2.0.32/dapl/openib_cma/device.c ---- dapl-2.0.32/dapl/openib_cma/device.c.open 2011-02-14 00:07:30.000000000 -0500 -+++ dapl-2.0.32/dapl/openib_cma/device.c 2011-07-22 14:20:30.045473449 -0400 -@@ -285,7 +285,6 @@ DAT_RETURN dapls_ib_open_hca(IN IB_HCA_N - } - ret = rdma_bind_addr(cm_id, (struct sockaddr *)&hca_ptr->hca_address); - if ((ret) || (cm_id->verbs == NULL)) { -- rdma_destroy_id(cm_id); - dapl_log(DAPL_DBG_TYPE_ERR, - " open_hca: rdma_bind ERR %s." - " Is %s configured?\n", strerror(errno), hca_name); diff --git a/SOURCES/dapl-2.0.34-compile.patch b/SOURCES/dapl-2.0.34-compile.patch deleted file mode 100644 index 54264ad..0000000 --- a/SOURCES/dapl-2.0.34-compile.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -upr dapl-2.0.34/dat/common/dat_strerror.c dapl-2.0.34.tmp/dat/common/dat_strerror.c ---- dapl-2.0.34/dat/common/dat_strerror.c 2011-08-19 13:09:23.000000000 -0400 -+++ dapl-2.0.34.tmp/dat/common/dat_strerror.c 2013-11-12 16:17:04.000000000 -0500 -@@ -601,7 +601,7 @@ dat_strerror(IN DAT_RETURN value, - - if (DAT_SUCCESS != dat_strerror_major(value, major_message)) { - return DAT_INVALID_PARAMETER; -- } else if (minor_message != NULL) { -+ } else if (minor_message) { - if (DAT_SUCCESS != dat_strerror_minor(value, minor_message)) { - return DAT_INVALID_PARAMETER; - } diff --git a/SPECS/dapl.spec b/SPECS/dapl.spec index 49b034c..e2cd17f 100644 --- a/SPECS/dapl.spec +++ b/SPECS/dapl.spec @@ -1,20 +1,19 @@ Name: dapl -Version: 2.0.39 -Release: 5%{?dist} +Version: 2.1.5 +Release: 1%{?dist} Summary: Library providing access to the DAT 2.0 API Group: System Environment/Libraries License: GPLv2 or BSD or CPL -Url: http://openfabrics.org/ -Source0: http://www.openfabrics.org/downloads/dapl/dapl-%{version}.tar.gz -Patch3: dapl-2.0.25-dat_ia_open_hang.patch -Patch4: dapl-2.0.34-compile.patch +Url: https://www.openfabrics.org/ +Source0: https://www.openfabrics.org/downloads/dapl/dapl-%{version}.tar.gz BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) Requires(post): /sbin/ldconfig Requires(postun): /sbin/ldconfig Obsoletes: udapl < 1.3 -BuildRequires: libibverbs-devel > 1.1.7, librdmacm-devel > 1.0.18 -BuildRequires: autoconf, libtool -ExcludeArch: s390 s390x +BuildRequires: libibverbs-devel > 1.1.7, librdmacm-devel > 1.0.18, ibacm-devel +BuildRequires: chrpath +ExcludeArch: s390 +#BuildRequires: autoconf, libtool %description libdat and libdapl provide a userspace implementation of the DAT 2.0 API and is built to natively support InfiniBand/iWARP network technology. @@ -44,10 +43,8 @@ Useful test suites to validate the dapl library API's and operation. %prep %setup -q -%patch3 -p1 -b .bz649360 -%patch4 -p1 -b .bz1029509 -aclocal -I config && libtoolize --force --copy && autoheader && \ - automake --foreign --add-missing --copy && autoconf +#aclocal -I config && libtoolize --force --copy && autoheader && \ +# automake --foreign --add-missing --copy && autoconf %build %configure CFLAGS="$CFLAGS -fno-strict-aliasing" --enable-ext-type=ib --sysconfdir=/etc/rdma @@ -58,6 +55,7 @@ rm -rf %{buildroot} make DESTDIR=%{buildroot} install # remove unpackaged files from the buildroot rm -f %{buildroot}%{_libdir}/*.la +chrpath -d %{buildroot}%{_bindir}/* %clean rm -rf %{buildroot} @@ -88,6 +86,13 @@ rm -rf %{buildroot} %{_mandir}/man1/* %changelog +* Tue Jun 09 2015 Doug Ledford - 2.1.5-1 +- Update to latest upstream release +- Include support for s390x +- Include support for aarch64 +- Drop old fix for NULL not defined, upstream has it resolved +- Resolves: bz1182180, bz1197216, bz1172462, bz1044727, bz1056487 + * Tue Oct 28 2014 Doug Ledford - 2.0.39-5 - Bump and rebuild after retagging the latest libibverbs and librdmacm into the build root @@ -104,7 +109,7 @@ rm -rf %{buildroot} * Fri Dec 27 2013 Daniel Mach - 2.0.39-2 - Mass rebuild 2013-12-27 -* Wed Dec 19 2013 Jay Fenlason - 2.0.39-1 +* Wed Dec 18 2013 Jay Fenlason - 2.0.39-1 - Upgrade to latest version Resolves: rhbz#985117 - Fix a compile problem with NULL not being defined