Hello community, here is the log from the commit of package dapl for openSUSE:Factory checked in at 2017-06-09 15:57:33 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/dapl (Old) and /work/SRC/openSUSE:Factory/.dapl.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "dapl" Fri Jun 9 15:57:33 2017 rev:5 rq:502397 version:2.1.8 Changes: -------- --- /work/SRC/openSUSE:Factory/dapl/dapl-debug.changes 2015-10-06 13:25:24.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.dapl.new/dapl-debug.changes 2017-06-09 15:57:34.722218449 +0200 @@ -1,0 +2,43 @@ +Tue May 30 08:50:05 UTC 2017 - nmoreychaisemartin@suse.com + +- Add conflicts between dapl and dapl-debug packages for devel + and utils +- Rename dapl-utils tests to avoid conflicts with other packages (dateutils) + * dapltest => dapl-test + * dtest => dapl-utest + * dtestcm => dapl-testcm + * dtestsrq => dapl-testsrq + * dtestx => dapl-testx +- Remove librdmacm and libibverbs version dependencies + +------------------------------------------------------------------- +Thu May 25 07:19:35 UTC 2017 - jengelh@inai.de + +- Restore description of libdapl. Fix some grammar errors. + +------------------------------------------------------------------- +Wed May 17 08:20:55 UTC 2017 - nmoreychaisemartin@suse.com + +- Disable dapl on armv7hl + +------------------------------------------------------------------- +Wed Mar 29 07:53:21 CEST 2017 - pth@suse.de + +- Make dependencies on libs now coming from rdma-core versioned. +- Remove unused patch dapl-rename_dtest.patch + +------------------------------------------------------------------- +Thu Mar 10 15:19:58 CET 2016 - pth@suse.de + +- Update to 2.1.8 git version (bsc#970668). + List of changes is too long so please see the included ChangeLog. +- Patches removed because the fixes are included upstream: + dapl-fix_type_punning.patch + dapl-autotools.patch + dapl-add-s390x-platform-support.patch + dapl-add-aarch64-platform-support.patch + dapl-add-s390x-platform-support.patch + +- Add dapl-s390.patch so that the defines are also valid for s390 + +------------------------------------------------------------------- dapl.changes: same change Old: ---- dapl-2.0.42.tar.gz dapl-add-aarch64-platform-support.patch dapl-add-s390x-platform-support.patch dapl-autotools.patch dapl-fix_type_punning.patch dapl-rename_dtest.patch New: ---- dapl-2.1.8-git6316f83.tar.xz dapl-s390.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ dapl-debug.spec ++++++ --- /var/tmp/diff_new_pack.1PW5nX/_old 2017-06-09 15:57:35.922049103 +0200 +++ /var/tmp/diff_new_pack.1PW5nX/_new 2017-06-09 15:57:35.922049103 +0200 @@ -1,7 +1,7 @@ # # spec file for package dapl-debug # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,24 +16,21 @@ # +%define git_version -git6316f83 Name: dapl-debug Summary: A Library for userspace access to RDMA devices using OS Agnostic DAT APIs License: BSD-3-Clause or GPL-2.0+ or CPL-1.0 Group: Productivity/Networking/System -Version: 2.0.42 +Version: 2.1.8 Release: 0 -Source0: https://www.openfabrics.org/downloads/dapl/dapl-%{version}.tar.gz -Source1: baselibs.conf -Source2: dapl-rpmlintrc +Source0: dapl-%{version}%{git_version}.tar.xz +Source1: dapl-rpmlintrc +Source2: baselibs.conf Patch1: dapl-2.0.30-dat-ia-open-hang.patch -Patch4: dapl-fix_type_punning.patch Patch5: dapl-define_NULL.patch Patch6: dapl-man_page_fixes.patch Patch7: dapl-fsf_address.patch -Patch8: dapl-add-s390x-platform-support.patch -Patch9: dapl-autotools.patch -Patch10: dapl-rename_dtest.patch -Patch11: dapl-add-aarch64-platform-support.patch +Patch12: dapl-s390.patch Url: http://www.openfabrics.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -41,8 +38,11 @@ BuildRequires: libibverbs-devel BuildRequires: librdmacm-devel BuildRequires: libtool +ExcludeArch: armv7hl -%if "%name" == "dapl-debug" +%if "%name" == "dapl" +Conflicts: dapl-debug +%else Conflicts: dapl %endif @@ -67,7 +67,7 @@ %endif %description -Along with the OpenFabrics kernel drivers, libdat and libdapl provides +Along with the OpenFabrics kernel drivers, libdat and libdapl provide a userspace RDMA API that supports DAT 2.0 specification and IB transport extensions for atomic operations and rdma write with immediate data. @@ -82,10 +82,10 @@ Requires: %name %description -n %lname -Along with the OpenIB kernel drivers, libdat2 and libdapl provide a -userspace RDMA API that supports DAT 2.0 specification. +libdat and libdapl provide a userspace RDMA API that supports DAT 2.0 +specification and IB transport extensions for atomic operations and +rdma write with immediate data. -%description -n %lname This package contains the runtime libraries. %if "%{name}" == "dapl-debug" The libraries have tracing enabled. @@ -96,56 +96,41 @@ Group: Development/Libraries/Other Requires: %{name} = %{version} Requires: glibc-devel -%if "%{name}" == "dapl" +%if "%name" == "dapl" Conflicts: dapl-debug-devel %else -Provides: dapl-devel +Conflicts: dapl-devel %endif %description devel Library links and header files for the libdat and libdapl libraries. - -%if "%{name}" != "dapl-debug" -%package doc -Summary: Manual pages for libdapl -Group: Documentation/Man -Requires: %{name} = %{version} -Provides: dapl:%{_mandir}/man5/dat.conf.5.gz -Provides: dapl_man - -%description doc -Along with the OpenFabrics kernel drivers, libdat and libdapl provides -a userspace RDMA API that supports DAT 2.0 specification and IB -transport extensions for atomic operations and rdma write with -immediate data. This package provides the Documentation for the -library. +%if "%{name}" == "dapl-debug" +The libraries have tracing enabled. %endif %package utils -Summary: Test suites for the uDAPL library +Summary: Test suite for the uDAPL library Group: Productivity/Networking/System Requires: %{name} = %{version}-%{release} -%if "%{name}" == "dapl" +Recommends: dapl-doc = %{version} +%if "%name" == "dapl" Conflicts: dapl-debug-utils +%else +Conflicts: dapl-utils %endif %description utils -Useful test suites to validate the uDAPL library APIs. +Test suite to validate the uDAPL library APIs. %prep %setup -q -n dapl-%{version} %patch1 -%patch4 %patch5 %patch6 %patch7 -%patch8 -p1 -%patch9 -%patch10 -%patch11 -p1 +%patch12 %build -mv man/dtest.1 man/dpltest.1 %if %suse_version == 1110 export ac_cv_suse11=yes %endif @@ -156,7 +141,7 @@ %configure --disable-static --with-pic --enable-debug %endif -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %check export MALLOC_CHECK_=2 @@ -173,6 +158,22 @@ mkdir -p %{buildroot}%_sysconfdir touch %{buildroot}%_sysconfdir/dat.conf +#Rename tests to avoid conflicts. +# dtest clashes with dateutils package +mv %{buildroot}%{_bindir}/dapltest %{buildroot}%{_bindir}/dapl-test +mv %{buildroot}%{_bindir}/dtest %{buildroot}%{_bindir}/dapl-utest +mv %{buildroot}%{_bindir}/dtestcm %{buildroot}%{_bindir}/dapl-testcm +mv %{buildroot}%{_bindir}/dtestsrq %{buildroot}%{_bindir}/dapl-testsrx +mv %{buildroot}%{_bindir}/dtestx %{buildroot}%{_bindir}/dapl-testx + +%if "%{name}" != "dapl-debug" +# Fix man pages accordingly +sed -e s/dapltest/dapl-test/g -e s/dtest/dapl-utest/g %{buildroot}%{_mandir}/man1/dtest.1 > %{buildroot}%{_mandir}/man1/dapl-utest.1 +rm %{buildroot}%{_mandir}/man1/dtest.1 +sed -e s/dapltest/dapl-test/g -e s/dtest/dapl-utest/g %{buildroot}%{_mandir}/man1/dapltest.1 > %{buildroot}%{_mandir}/man1/dapl-test.1 +rm %{buildroot}%{_mandir}/man1/dapltest.1 +%endif + %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -255,6 +256,10 @@ %doc AUTHORS README COPYING ChangeLog LICENSE.txt LICENSE2.txt LICENSE3.txt %_libdir/libdapl*.so.* %config %ghost %_sysconfdir/dat.conf +%if "%{name}" != "dapl-debug" +%_mandir/man5/dat.conf.5* +%endif +%doc %files -n %lname %defattr(-,root,root) @@ -265,15 +270,12 @@ %_includedir/dat2/ %_libdir/*.so -%if "%{name}" != "dapl-debug" -%files doc -%defattr(-, root, root) -%_mandir/man1/* -%_mandir/man5/* -%endif - %files utils %defattr(-,root,root,-) %{_bindir}/* +%if "%{name}" != "dapl-debug" +%_mandir/man1/dapl-test.1* +%_mandir/man1/dapl-utest.1* +%endif %changelog ++++++ dapl.spec ++++++ --- /var/tmp/diff_new_pack.1PW5nX/_old 2017-06-09 15:57:35.958044023 +0200 +++ /var/tmp/diff_new_pack.1PW5nX/_new 2017-06-09 15:57:35.962043458 +0200 @@ -1,7 +1,7 @@ # # spec file for package dapl # -# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -16,24 +16,21 @@ # +%define git_version -git6316f83 Name: dapl Summary: A Library for userspace access to RDMA devices using OS Agnostic DAT APIs License: BSD-3-Clause or GPL-2.0+ or CPL-1.0 Group: Productivity/Networking/System -Version: 2.0.42 +Version: 2.1.8 Release: 0 -Source0: https://www.openfabrics.org/downloads/dapl/dapl-%{version}.tar.gz -Source1: baselibs.conf -Source2: dapl-rpmlintrc +Source0: dapl-%{version}%{git_version}.tar.xz +Source1: dapl-rpmlintrc +Source2: baselibs.conf Patch1: dapl-2.0.30-dat-ia-open-hang.patch -Patch4: dapl-fix_type_punning.patch Patch5: dapl-define_NULL.patch Patch6: dapl-man_page_fixes.patch Patch7: dapl-fsf_address.patch -Patch8: dapl-add-s390x-platform-support.patch -Patch9: dapl-autotools.patch -Patch10: dapl-rename_dtest.patch -Patch11: dapl-add-aarch64-platform-support.patch +Patch12: dapl-s390.patch Url: http://www.openfabrics.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf @@ -41,8 +38,11 @@ BuildRequires: libibverbs-devel BuildRequires: librdmacm-devel BuildRequires: libtool +ExcludeArch: armv7hl -%if "%name" == "dapl-debug" +%if "%name" == "dapl" +Conflicts: dapl-debug +%else Conflicts: dapl %endif @@ -67,7 +67,7 @@ %endif %description -Along with the OpenFabrics kernel drivers, libdat and libdapl provides +Along with the OpenFabrics kernel drivers, libdat and libdapl provide a userspace RDMA API that supports DAT 2.0 specification and IB transport extensions for atomic operations and rdma write with immediate data. @@ -82,10 +82,10 @@ Requires: %name %description -n %lname -Along with the OpenIB kernel drivers, libdat2 and libdapl provide a -userspace RDMA API that supports DAT 2.0 specification. +libdat and libdapl provide a userspace RDMA API that supports DAT 2.0 +specification and IB transport extensions for atomic operations and +rdma write with immediate data. -%description -n %lname This package contains the runtime libraries. %if "%{name}" == "dapl-debug" The libraries have tracing enabled. @@ -96,56 +96,41 @@ Group: Development/Libraries/Other Requires: %{name} = %{version} Requires: glibc-devel -%if "%{name}" == "dapl" +%if "%name" == "dapl" Conflicts: dapl-debug-devel %else -Provides: dapl-devel +Conflicts: dapl-devel %endif %description devel Library links and header files for the libdat and libdapl libraries. - -%if "%{name}" != "dapl-debug" -%package doc -Summary: Manual pages for libdapl -Group: Documentation/Man -Requires: %{name} = %{version} -Provides: dapl:%{_mandir}/man5/dat.conf.5.gz -Provides: dapl_man - -%description doc -Along with the OpenFabrics kernel drivers, libdat and libdapl provides -a userspace RDMA API that supports DAT 2.0 specification and IB -transport extensions for atomic operations and rdma write with -immediate data. This package provides the Documentation for the -library. +%if "%{name}" == "dapl-debug" +The libraries have tracing enabled. %endif %package utils -Summary: Test suites for the uDAPL library +Summary: Test suite for the uDAPL library Group: Productivity/Networking/System Requires: %{name} = %{version}-%{release} -%if "%{name}" == "dapl" +Recommends: dapl-doc = %{version} +%if "%name" == "dapl" Conflicts: dapl-debug-utils +%else +Conflicts: dapl-utils %endif %description utils -Useful test suites to validate the uDAPL library APIs. +Test suite to validate the uDAPL library APIs. %prep %setup -q -n dapl-%{version} %patch1 -%patch4 %patch5 %patch6 %patch7 -%patch8 -p1 -%patch9 -%patch10 -%patch11 -p1 +%patch12 %build -mv man/dtest.1 man/dpltest.1 %if %suse_version == 1110 export ac_cv_suse11=yes %endif @@ -156,7 +141,7 @@ %configure --disable-static --with-pic --enable-debug %endif -make %{?_smp_mflags} +make %{?_smp_mflags} V=1 %check export MALLOC_CHECK_=2 @@ -173,6 +158,22 @@ mkdir -p %{buildroot}%_sysconfdir touch %{buildroot}%_sysconfdir/dat.conf +#Rename tests to avoid conflicts. +# dtest clashes with dateutils package +mv %{buildroot}%{_bindir}/dapltest %{buildroot}%{_bindir}/dapl-test +mv %{buildroot}%{_bindir}/dtest %{buildroot}%{_bindir}/dapl-utest +mv %{buildroot}%{_bindir}/dtestcm %{buildroot}%{_bindir}/dapl-testcm +mv %{buildroot}%{_bindir}/dtestsrq %{buildroot}%{_bindir}/dapl-testsrx +mv %{buildroot}%{_bindir}/dtestx %{buildroot}%{_bindir}/dapl-testx + +%if "%{name}" != "dapl-debug" +# Fix man pages accordingly +sed -e s/dapltest/dapl-test/g -e s/dtest/dapl-utest/g %{buildroot}%{_mandir}/man1/dtest.1 > %{buildroot}%{_mandir}/man1/dapl-utest.1 +rm %{buildroot}%{_mandir}/man1/dtest.1 +sed -e s/dapltest/dapl-test/g -e s/dtest/dapl-utest/g %{buildroot}%{_mandir}/man1/dapltest.1 > %{buildroot}%{_mandir}/man1/dapl-test.1 +rm %{buildroot}%{_mandir}/man1/dapltest.1 +%endif + %post -n %lname -p /sbin/ldconfig %postun -n %lname -p /sbin/ldconfig @@ -255,6 +256,10 @@ %doc AUTHORS README COPYING ChangeLog LICENSE.txt LICENSE2.txt LICENSE3.txt %_libdir/libdapl*.so.* %config %ghost %_sysconfdir/dat.conf +%if "%{name}" != "dapl-debug" +%_mandir/man5/dat.conf.5* +%endif +%doc %files -n %lname %defattr(-,root,root) @@ -265,15 +270,12 @@ %_includedir/dat2/ %_libdir/*.so -%if "%{name}" != "dapl-debug" -%files doc -%defattr(-, root, root) -%_mandir/man1/* -%_mandir/man5/* -%endif - %files utils %defattr(-,root,root,-) %{_bindir}/* +%if "%{name}" != "dapl-debug" +%_mandir/man1/dapl-test.1* +%_mandir/man1/dapl-utest.1* +%endif %changelog ++++++ dapl-2.0.30-dat-ia-open-hang.patch ++++++ --- /var/tmp/diff_new_pack.1PW5nX/_old 2017-06-09 15:57:36.006037249 +0200 +++ /var/tmp/diff_new_pack.1PW5nX/_new 2017-06-09 15:57:36.006037249 +0200 @@ -11,13 +11,13 @@ Index: dapl/openib_cma/device.c =================================================================== ---- dapl/openib_cma/device.c.orig 2011-08-19 19:09:23.000000000 +0200 -+++ dapl/openib_cma/device.c 2012-05-09 15:10:12.629247619 +0200 -@@ -289,7 +289,6 @@ DAT_RETURN dapls_ib_open_hca(IN IB_HCA_N +--- dapl/openib_cma/device.c.orig 2016-03-10 15:08:38.037462973 +0100 ++++ dapl/openib_cma/device.c 2016-03-10 15:10:39.068801915 +0100 +@@ -313,7 +313,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); + " Is %s configured as IPoIB?\n", strerror(errno), hca_name); ++++++ dapl-rpmlintrc ++++++ --- /var/tmp/diff_new_pack.1PW5nX/_old 2017-06-09 15:57:36.046031604 +0200 +++ /var/tmp/diff_new_pack.1PW5nX/_new 2017-06-09 15:57:36.046031604 +0200 @@ -2,7 +2,11 @@ from Config import * addFilter(".* shared-lib-calls-exit") + #dapl is unique: differently named packages contain the same #shared library but one compiled with tracing enabled. - addFilter(".* shlib-policy-name-error") + +# As this is a plugin for libibverbs, there is no reason +# to name it according to policy +addFilter(".* shlib-policy-missing-suffix") ++++++ dapl-s390.patch ++++++ --- dapl/udapl/linux/dapl_osd.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) Index: dapl/udapl/linux/dapl_osd.h =================================================================== --- dapl/udapl/linux/dapl_osd.h.orig 2016-03-10 14:56:57.000000000 +0100 +++ dapl/udapl/linux/dapl_osd.h 2016-03-10 18:28:46.909424533 +0100 @@ -51,7 +51,7 @@ #if !defined (__i386__) && !defined (__ia64__) && !defined(__x86_64__) && \ !defined(__PPC__) && !defined(__PPC64__) && !defined(__s390x__) && \ - !defined(__aarch64__) + !defined(__aarch64__) && !defined(__s390__) #error UNDEFINED ARCH #endif @@ -160,7 +160,7 @@ int dapl_os_get_env_val ( /* atomic functions */ -#ifdef __s390x__ +#if defined(__s390x__) || defined(__s390__) #define DAPL_CS_ADD(ptr, op_val) ({ \ int old_val, new_val; \ __asm__ __volatile__( \ @@ -199,7 +199,7 @@ dapl_os_atomic_inc ( #else IA64_FETCHADD(old_value,v,1,4); #endif -#elif defined(__s390x__) +#elif defined(__s390x__) || defined(__s390__) DAT_COUNT tmp; DAT_COUNT delta = 1; @@ -245,7 +245,7 @@ dapl_os_atomic_dec ( #else IA64_FETCHADD(old_value,v,-1,4); #endif -#elif defined(__s390x__) +#elif defined(__s390x__) || defined(__s390__) DAT_COUNT tmp; DAT_COUNT delta = -1; @@ -307,7 +307,7 @@ dapl_os_atomic_assign ( #else current_value = ia64_cmpxchg(acq,v,match_value,new_value,4); #endif /* __ia64__ */ -#elif defined(__s390x__) +#elif defined(__s390x__) || defined(__s390__) __asm__ __volatile__( " cs %0,%2,%1\n" : "+d" (match_value), "=Q" (*v)