From 8f9382fa605b8282ae7a64cca4545343f04a561d1fe83bd57961e7ba18e9a175 Mon Sep 17 00:00:00 2001 From: Christian Goll Date: Tue, 9 May 2023 13:00:02 +0000 Subject: [PATCH] Accepting request 1084704 from home:dimstar:Factory - Convert to proper multibuild package: the spec is already all done to distinguish flavors. OBS-URL: https://build.opensuse.org/request/show/1084704 OBS-URL: https://build.opensuse.org/package/show/science:HPC/dapl?expand=0&rev=24 --- _multibuild | 4 + dapl-debug.changes | 395 --------------------------------------------- dapl-debug.spec | 290 --------------------------------- dapl.changes | 6 + dapl.spec | 29 ++-- pre_checkin.sh | 8 - 6 files changed, 27 insertions(+), 705 deletions(-) create mode 100644 _multibuild delete mode 100644 dapl-debug.changes delete mode 100644 dapl-debug.spec delete mode 100644 pre_checkin.sh diff --git a/_multibuild b/_multibuild new file mode 100644 index 0000000..b1644d0 --- /dev/null +++ b/_multibuild @@ -0,0 +1,4 @@ + + debug + + diff --git a/dapl-debug.changes b/dapl-debug.changes deleted file mode 100644 index 14e7c61..0000000 --- a/dapl-debug.changes +++ /dev/null @@ -1,395 +0,0 @@ -------------------------------------------------------------------- -Tue May 29 06:04:37 UTC 2018 - nmoreychaisemartin@suse.com - -- Add ucm-mcm-fix-backlog-parameter-for-socket.patch to fix - a "deadlock" that causes socket connection to timeout when - net.ipv4.tcp_syncookies=0. (bsc#1094657) - -------------------------------------------------------------------- -Thu May 24 12:47:16 UTC 2018 - kasimir_@outlook.de - -- Add patch for arm platform support - * dapl-add-arm-platform-support.patch - -------------------------------------------------------------------- -Thu Jul 20 08:25:04 UTC 2017 - nmoreychaisemartin@suse.com - -- Update to 2.1.10 - * dtest_suite: add option to pause the test. - * dtestcm: add client retry, give server time to queue up all listens - * dtest: Add new man pages. (dtestx dtestcm dtestsrq) - * cma: fix open_query mode, initialize attributes - * ucm: up level CM timer logging, increase drep time at scale - * dtest: fix return value check on do_rdma_write_with_msg - * dtestx: check device capabilities and do atomic tests only if supported by HW - * common: set atomic attributes based on provider/device capabilities - * build: dtest_suite.sh was moved to test/scripts - * mpxyd: let TX thread sleep if no open devices are referenced - * mcm: when mmap req from MIC return with fail stat print WARN. - * dtest_suite: remove duplicate dtest_suite.sh - * dtest: enable -D option (data check) to work with scif provider - * dtest_suite: fix typo in user_string var - * mcm: remove logs from post send speed path - * mcm proxy: push WR from MIC to host with scif mmap memory instead of scif_send. - * dtest: the default size in pingpong test is set to 1 byte regardless to user input. - * dtest: cleanup 4 printfs from the middle of performance test, may reduce performance. -- Refresh patches against 2.1.10 - -------------------------------------------------------------------- -Mon Jun 12 09:28:22 UTC 2017 - nmoreychaisemartin@suse.com - -- Merge .changes files with SLE12-SP3 (bsc#1041579) - -------------------------------------------------------------------- -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 - -------------------------------------------------------------------- -Thu Sep 10 08:04:16 UTC 2015 - dmueller@suse.com - -- add dapl-add-aarch64-platform-support.patch (fate#318444) -- revert last change - -------------------------------------------------------------------- -Tue Aug 25 12:26:58 CEST 2015 - pth@suse.de - -- Exclude aarch64 as there is currently no assembler code for this - architecture. - -------------------------------------------------------------------- -Tue Aug 11 11:04:01 CEST 2015 - pth@suse.de - -- Replace dapl-s390_support.patch with - dapl-add-s390x-platform-support.patch (bsc#934683). -- Fix library name in baselibs.conf. -- Tag baselibs.conf and dapl-rpmlintrc as source. -- libdapl*.so work like plugins, hence they do not get a separate - subpackage. So shut up rpmlint complaining about the package - name. -- Drop the dapl-doc sub package and move the man pages to the - packages containing the files/programs they describe. - -------------------------------------------------------------------- -Wed Feb 4 14:33:06 UTC 2015 - dimstar@opensuse.org - -- Also have dapl-utils conflict with dapl-debug-utils. -- Fix baselibs.conf to build libdat2-2-32bit. - -------------------------------------------------------------------- -Mon Sep 8 07:46:08 UTC 2014 - coolo@suse.com - -- dapl-debug can't obsolete dapl or zypper will switch between the versions - all the time. They do conflict though - -------------------------------------------------------------------- -Fri Aug 8 19:06:02 CEST 2014 - pth@suse.de - -- Add dapl-rename_dtest.patch to rename dtest to dpltest because - of name clash with dateutils. -- Also rename the man page for dtest. -- Make dapl-devel and dapl-debug-devel obsolete each other. - -------------------------------------------------------------------- -Thu Aug 7 11:55:32 CEST 2014 - pth@suse.de - -- Readd s390 support (bnc#856126). - -------------------------------------------------------------------- -Mon Aug 4 11:28:47 CEST 2014 - pth@suse.de - -- Remove s390 support (bnc#856126). - -------------------------------------------------------------------- -Fri Jun 27 14:11:27 CEST 2014 - pth@suse.de - -- Add baselibs.conf and dapl-rpmlintrc as source. -- Fix dapl-fix_type_punning.patch. -- Fix type punning in cm.c - -------------------------------------------------------------------- -Wed Jun 25 11:20:11 CEST 2014 - pth@suse.de - -- Remove dapl-2.0.13-build_error.patch as it isn't needed anymore. - -------------------------------------------------------------------- -Wed Jun 25 11:08:45 CEST 2014 - pth@suse.de - -- Provide full source URL - -------------------------------------------------------------------- -Tue May 20 13:54:20 CEST 2014 - pth@suse.de - -- Fix typo in dapl_test.c. - -------------------------------------------------------------------- -Thu May 15 11:43:25 CEST 2014 - pth@suse.de - -- Reenable the code for s390x also for s390. -- Adapt dapl-fix_type_punning.patch to changed code. -- Fix obsoletes entry. -- Fix type punning with memcpy instead of unions. - -------------------------------------------------------------------- -Tue May 13 22:52:17 CEST 2014 - pth@suse.de - -- Update tp 2.0.42 from OFED 3.12 RC2. - Changes since 2.0.40: - * dapltest: increase DTO evd size to prevent CQ overflow on - limit_rpost test. - * Creation of reserved SP moves EP state to DAT_EP_STATE_RESERVED - even in failure cases. Reserve EP after successfully binding the - listening port. - * dapl: fix string bug in dapls_dto_op_str - This led to indexing off the end of the array and gave - surprising results for OP_RECV_UD. - * dapltest: change server port, from 45278 to 62000, out of - registered IANA range. - * dat: lower log level on load errors of provider library - * dat: dat_ia_open should close provider after failure - * dapltest: set default limit max to 1000 - * openib: add new provider specific attributes - * dapltest: update scripts for regression testing purposes - * cl.sh and srv.sh update to provide better examples and - a methods to quickly regression test any dapltest changes. - * dapltest: Add final send/recv "sync" for transaction tests. - -For the complete and unabbreviated Changes please see the file -ChangeLog in the package documentation. - -------------------------------------------------------------------- -Thu Feb 13 16:43:01 CET 2014 - pth@suse.de - -- Update to 2.0.40 (fate#315488): - dist: ib collective extension include files missing - dapltest: the quit command is missing changes for -n option. - Server-port was not being set properly during param init phase - on the client side. - dat.conf: remove v1, add Mellanox Connect-IB and Intel Xeon Phi - MIC. - NULL undefined on Fedora, incorrectly using kernel stddef.h - -------------------------------------------------------------------- -Tue Jan 21 18:46:54 CET 2014 - pth@suse.de - -- Add dapl-autotools.patch to make autoreconf complain less. - -------------------------------------------------------------------- -Fri Jan 17 12:13:40 CET 2014 - pth@suse.de - -- Update to 2.0.39 from 3.12 daily snapshot. -- Include dapl-s390_support.patch from IBM for s390 support. -- Remove now unneeded patches: - dapl-2.0.13-build_error.patch -- Use script to generate spec and changes for dapl-debug from the - dapl files. - -------------------------------------------------------------------- -Wed Jan 15 13:47:59 CET 2014 - pth@suse.de - -- Build for s390x - -------------------------------------------------------------------- -Thu Sep 13 13:59:23 CEST 2012 - pth@suse.de - -- Add another filter to dapl-rpmlintrc as the packages for - the runtime library are named differently but contain a library - that's named the same. - -------------------------------------------------------------------- -Wed Sep 5 18:12:59 CEST 2012 - pth@suse.de - -- Reinstate the arch exclusion of s390(x). -- Recompress with bzip2. - -------------------------------------------------------------------- -Wed Sep 5 14:38:57 UTC 2012 - jengelh@inai.de - -- Remove redundant tags/sections from specfile -- Remove unjustified s390* arch exclusion -- Implement shared library policy - -------------------------------------------------------------------- -Thu Aug 30 14:45:19 CEST 2012 - pth@suse.de - -- Update to OFED 1.5.4.1 (dapl unchanged). -- Rename the package with tracing enabled dapl-tracing. -- Adapt baselibs.conf to new packages and names. -- Use one .spec and .changes file and create the -tracing - variants with pre_checkin.sh. -- Update FSF address in LICENSE3.txt. - -------------------------------------------------------------------- -Tue Jul 3 18:19:08 CEST 2012 - pth@suse.de - -- Put shared libs into a versioned package. -- Fix man pages -- Add a rpmlintrc to shut up warnings that can only be solved upstream. - -------------------------------------------------------------------- -Thu Jun 28 18:55:46 CEST 2012 - pth@suse.de - -- Use unions for type punning (dapl-type_punning.patch). -- Include stddef.h to get NULL defined. -- Require automake, autoconf and libtool. -- Provide obsoleted items. - -------------------------------------------------------------------- -Wed May 9 13:48:37 CEST 2012 - pth@suse.de - -- Update to OFED 1.5.4 -- Don't recompress the tarball. -- Remove unneeded patches and adapt the remaining ones. - -------------------------------------------------------------------- -Mon Jun 20 16:41:37 CEST 2011 - pth@suse.de - -- Sed is also needed. - -------------------------------------------------------------------- -Thu Jun 9 18:45:01 CEST 2011 - pth@suse.de - -- After last change dapl needs cat so add prereq (bnc#688511). - -------------------------------------------------------------------- -Mon Mar 7 16:15:35 CET 2011 - pth@suse.de - -- Don't remove the configuration for this dapl version on update - (bnc#676731). -- Use cat instead of multiple echos. -- Include /etc/dat.conf as %conf %ghost. - -------------------------------------------------------------------- -Fri Mar 4 13:16:19 CET 2011 - pth@suse.de - -- Fix tmp race in post/postun (bnc#676700). - -------------------------------------------------------------------- -Wed Feb 1 16:59:22 CET 2011 - pth@suse.de - -- Incorporate fixes done for the update in SLE10: - -- Split off man pages into their own sub package that can be - required by compat-dapl. -- Fix type-punning in test app so that we don't need - -fno-strict-aliasing allowing better code optimisation. -- Also fix type punning in other files that the newer gcc in SLE11 - detected. -- realigned-disconnect.patch fixing bnc#656702 -- added cma-fix-debug-build-issue.patch fixing debug build. - -------------------------------------------------------------------- -Tue Nov 23 18:46:55 CET 2010 - pth@suse.de - -- Let the caller detect EINTR (bnc#655518). - -------------------------------------------------------------------- -Mon Oct 25 15:38:55 UTC 2010 - jjolly@novell.com - -- Update to v2.0.30 from OFED 1.5.2 -- Update to include more lines for dat.conf -- Patch to remove extra rdma_destroy_id() (bnc#647915) - -------------------------------------------------------------------- -Tue Dec 8 01:03:36 CET 2009 - ro@suse.de - -- fix build on ia64: help configure dectecting suse_version - -------------------------------------------------------------------- -Thu Dec 3 08:34:10 CET 2009 - jjolly@suse.de - -- Update to v2.0.19 from OFED 1.4.2 - -------------------------------------------------------------------- -Thu Dec 11 03:37:05 CET 2008 - jjolly@suse.de - -- Updated to v2.0.15 from OFED 1.4 GA - - dapltest: transaction test moves to cleanup stage before - rdma_read processing is complete - - Change SR to include sysconfdir. - -------------------------------------------------------------------- -Wed Dec 10 12:34:56 CET 2008 - olh@suse.de - -- use Obsoletes: -XXbit only for ppc64 to help solver during distupgrade - (bnc#437293) - -------------------------------------------------------------------- -Thu Nov 6 14:01:02 CET 2008 - ihno@suse.de - -- adding baselibs.conf - -------------------------------------------------------------------- -Tue Nov 4 11:50:42 CET 2008 - ro@suse.de - -- fix build on ia64 (same as in compat-dapl) - -------------------------------------------------------------------- -Thu Oct 30 12:34:56 CET 2008 - olh@suse.de - -- obsolete old -XXbit packages (bnc#437293) - -------------------------------------------------------------------- -Mon Oct 27 20:13:18 CET 2008 - jjolly@suse.de - -- Updated to v2.0.14 from OFED 1.4 rc3 - -------------------------------------------------------------------- -Mon Oct 20 12:24:48 CEST 2008 - ihno@suse.de - -- Excludearch for s390 s390x - -------------------------------------------------------------------- -Fri Sep 12 10:52:31 CEST 2008 - jjolly@suse.de - -- Updated to v2.0.13 from OFED 1.4 RC1 and changed from dapl2 to dapl - -------------------------------------------------------------------- -Mon Apr 28 22:00:19 CEST 2008 - crrodriguez@suse.de - -- do not build unusable static libraries -- fix -devel package requires - -------------------------------------------------------------------- -Mon Mar 3 07:10:58 CET 2008 - jjolly@suse.de - -- Initial submission of dapl v2.0.7 from OFED 1.3 GA release - diff --git a/dapl-debug.spec b/dapl-debug.spec deleted file mode 100644 index bb48fc7..0000000 --- a/dapl-debug.spec +++ /dev/null @@ -1,290 +0,0 @@ -# -# spec file for package dapl-debug -# -# Copyright (c) 2018 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 -# upon. The license for this file, and modifications and additions to the -# file, is the same license as for the pristine package itself (unless the -# license for the pristine package is not an Open Source License, in which -# case the license is the MIT License). An "Open Source License" is a -# license that conforms to the Open Source Definition (Version 1.9) -# published by the Open Source Initiative. - -# Please submit bugfixes or comments via http://bugs.opensuse.org/ -# - - -%define git_version %nil -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-later OR CPL-1.0 -Group: Productivity/Networking/System -Version: 2.1.10 -Release: 0 -Source0: https://www.openfabrics.org/downloads/dapl/dapl-%version.tar.gz -Source1: dapl-rpmlintrc -Source2: baselibs.conf -Patch1: dapl-2.0.30-dat-ia-open-hang.patch -Patch5: dapl-define_NULL.patch -Patch6: dapl-man_page_fixes.patch -Patch7: dapl-fsf_address.patch -Patch12: dapl-s390.patch -Patch13: dapl-add-arm-platform-support.patch -Patch14: ucm-mcm-fix-backlog-parameter-for-socket.patch -Url: http://www.openfabrics.org -BuildRoot: %{_tmppath}/%{name}-%{version}-build -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: libibverbs-devel -BuildRequires: librdmacm-devel -BuildRequires: libtool - -%if "%name" == "dapl" -Conflicts: dapl-debug -%else -Conflicts: dapl -%endif - -# bug437293 -%ifarch ppc64 -Obsoletes: dapl-64bit -%endif -# -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Requires(post): sed -Requires(post): coreutils - -# libdapl*.so work like plugins, hence they do not get a separate subpackage. - -%if "%{name}" == "dapl-debug" -%define lname dapl-debug-libs -%define other_lname libdat2-2 -%else -%define lname libdat2-2 -%define other_lname dapl-debug-libs -%endif - -%description -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. - -%package -n %lname -Summary: DAPL runtime libraries -Group: System/Libraries -Conflicts: %other_lname -Obsoletes: dapl2 < %version -Provides: dapl2 = %version -# Need dat.conf -Requires: %name - -%description -n %lname -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. - -This package contains the runtime libraries. -%if "%{name}" == "dapl-debug" -The libraries have tracing enabled. -%endif - -%package devel -Summary: Development files for the libdat and libdapl libraries -Group: Development/Libraries/Other -Requires: %{name} = %{version} -Requires: glibc-devel -%if "%name" == "dapl" -Conflicts: dapl-debug-devel -%else -Conflicts: dapl-devel -%endif - -%description devel -Library links and header files for the libdat and libdapl libraries. -%if "%{name}" == "dapl-debug" -The libraries have tracing enabled. -%endif - -%package utils -Summary: Test suite for the uDAPL library -Group: Productivity/Networking/System -Requires: %{name} = %{version}-%{release} -Recommends: dapl-doc = %{version} -%if "%name" == "dapl" -Conflicts: dapl-debug-utils -%else -Conflicts: dapl-utils -%endif - -%description utils -Test suite to validate the uDAPL library APIs. - -%prep -%setup -q -n dapl-%{version} -%patch1 -%patch5 -%patch6 -%patch7 -%patch12 -%patch13 -%patch14 - -%build -%if %suse_version == 1110 -export ac_cv_suse11=yes -%endif -autoreconf -fi -%if "%name" == "dapl" -%configure --disable-static --with-pic -%else -%configure --disable-static --with-pic --enable-debug -%endif - -make %{?_smp_mflags} V=1 - -%check -export MALLOC_CHECK_=2 -make check -unset MALLOC_CHECK_ - -%install -make DESTDIR=%{buildroot} install - -rm -f %{buildroot}%_libdir/*.la -%if "%{name}" == "dapl-debug" -rm -rf %{buildroot}%{_mandir}/man{1,5}/* -%endif -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 - -%define man_regexp -e s/dapltest/dapl-test/g -e s/dtestcm/dapl-testcm/g -e s/dtestsrq/dapl-testsrq/g -e s/dtestx/dapl-testx/g -e s/dtest/dapl-utest/g - -%if "%{name}" != "dapl-debug" -# Fix man pages accordingly -for manpage in dapltest dtest dtestcm dtestsrq dtestx; do - new_name=$(echo $manpage | sed %man_regexp) - sed %man_regexp %{buildroot}%{_mandir}/man1/$manpage.1 > %{buildroot}%{_mandir}/man1/$new_name.1 - rm %{buildroot}%{_mandir}/man1/$manpage.1 -done -%endif - -%post -n %lname -p /sbin/ldconfig - -%postun -n %lname -p /sbin/ldconfig - -%post -/sbin/ldconfig -if test -e %_sysconfdir/dat.conf; then - sed -i -e '/ofa-v2-.* u2/d' %_sysconfdir/dat.conf -else - touch %_sysconfdir/dat.conf -fi -cat <>%_sysconfdir/dat.conf -ofa-v2-mlx4_0-1 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mlx4_0 1" "" -ofa-v2-mlx4_0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mlx4_0 2" "" -ofa-v2-ib0 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "ib0 0" "" -ofa-v2-ib1 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "ib1 0" "" -ofa-v2-mthca0-1 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mthca0 1" "" -ofa-v2-mthca0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mthca0 2" "" -ofa-v2-ipath0-1 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "ipath0 1" "" -ofa-v2-ipath0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "ipath0 2" "" -ofa-v2-ehca0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "ehca0 1" "" -ofa-v2-iwarp u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "eth2 0" "" -ofa-v2-mlx4_0-1u u2.0 nonthreadsafe default libdaploucm.so.2 dapl.2.0 "mlx4_0 1" "" -ofa-v2-mlx4_0-2u u2.0 nonthreadsafe default libdaploucm.so.2 dapl.2.0 "mlx4_0 2" "" -ofa-v2-mthca0-1u u2.0 nonthreadsafe default libdaploucm.so.2 dapl.2.0 "mthca0 1" "" -ofa-v2-mthca0-2u u2.0 nonthreadsafe default libdaploucm.so.2 dapl.2.0 "mthca0 2" "" -ofa-v2-cma-roe-eth2 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "eth2 0" "" -ofa-v2-cma-roe-eth3 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "eth3 0" "" -ofa-v2-scm-roe-mlx4_0-1 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mlx4_0 1" "" -ofa-v2-scm-roe-mlx4_0-2 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mlx4_0 2" "" -ofa-v2-mcm-1 u2.0 nonthreadsafe default libdaplomcm.so.2 dapl.2.0 "mlx4_0 1" "" -ofa-v2-mcm-2 u2.0 nonthreadsafe default libdaplomcm.so.2 dapl.2.0 "mlx4_0 2" "" -ofa-v2-scif0 u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "scif0 1" "" -ofa-v2-scif0-u u2.0 nonthreadsafe default libdaploucm.so.2 dapl.2.0 "scif0 1" "" -ofa-v2-mic0 u2.0 nonthreadsafe default libdaplofa.so.2 dapl.2.0 "mic0:ib 1" "" -ofa-v2-mlx4_0-1s u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mlx4_0 1" "" -ofa-v2-mlx4_0-2s u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mlx4_0 2" "" -ofa-v2-mlx4_1-1s u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mlx4_1 1" "" -ofa-v2-mlx4_1-2s u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mlx4_1 2" "" -ofa-v2-mlx4_1-1u u2.0 nonthreadsafe default libdaploucm.so.2 dapl.2.0 "mlx4_1 1" "" -ofa-v2-mlx4_1-2u u2.0 nonthreadsafe default libdaploucm.so.2 dapl.2.0 "mlx4_1 2" "" -ofa-v2-mlx4_0-1m u2.0 nonthreadsafe default libdaplomcm.so.2 dapl.2.0 "mlx4_0 1" "" -ofa-v2-mlx4_0-2m u2.0 nonthreadsafe default libdaplomcm.so.2 dapl.2.0 "mlx4_0 2" "" -ofa-v2-mlx4_1-1m u2.0 nonthreadsafe default libdaplomcm.so.2 dapl.2.0 "mlx4_1 1" "" -ofa-v2-mlx4_1-2m u2.0 nonthreadsafe default libdaplomcm.so.2 dapl.2.0 "mlx4_1 2" "" -ofa-v2-mlx5_0-1s u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mlx5_0 1" "" -ofa-v2-mlx5_0-2s u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mlx5_0 2" "" -ofa-v2-mlx5_1-1s u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mlx5_1 1" "" -ofa-v2-mlx5_1-2s u2.0 nonthreadsafe default libdaploscm.so.2 dapl.2.0 "mlx5_1 2" "" -ofa-v2-mlx5_0-1u u2.0 nonthreadsafe default libdaploucm.so.2 dapl.2.0 "mlx5_0 1" "" -ofa-v2-mlx5_0-2u u2.0 nonthreadsafe default libdaploucm.so.2 dapl.2.0 "mlx5_0 2" "" -ofa-v2-mlx5_1-1u u2.0 nonthreadsafe default libdaploucm.so.2 dapl.2.0 "mlx5_1 1" "" -ofa-v2-mlx5_1-2u u2.0 nonthreadsafe default libdaploucm.so.2 dapl.2.0 "mlx5_1 2" "" -ofa-v2-mlx5_0-1m u2.0 nonthreadsafe default libdaplomcm.so.2 dapl.2.0 "mlx5_0 1" "" -ofa-v2-mlx5_0-2m u2.0 nonthreadsafe default libdaplomcm.so.2 dapl.2.0 "mlx5_0 2" "" -ofa-v2-mlx5_1-1m u2.0 nonthreadsafe default libdaplomcm.so.2 dapl.2.0 "mlx5_1 1" "" -ofa-v2-mlx5_1-2m u2.0 nonthreadsafe default libdaplomcm.so.2 dapl.2.0 "mlx5_1 2" "" -EOF -#On update save configuration before uninstall of old package runs -if [ $1 -gt 0 ]; then - cp -p %_sysconfdir/dat.conf %_sysconfdir/dat.conf.rpmtmp -fi - -%posttrans -if [ -e "%_sysconfdir/dat.conf.rpmtmp" ]; then - mv %_sysconfdir/dat.conf.rpmtmp %_sysconfdir/dat.conf -fi - -%postun -/sbin/ldconfig -#remove if this isn't an update -if [ $1 -eq 0 ]; then - if test -e %_sysconfdir/dat.conf; then - sed -i -e '/OpenIB-.* u1/d' %_sysconfdir/dat.conf - fi -fi - -%files -%defattr(-, root, root) -%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) -%_libdir/libdat2.so.* - -%files devel -%defattr(-, root, root) -%_includedir/dat2/ -%_libdir/*.so - -%files utils -%defattr(-,root,root,-) -%{_bindir}/* -%if "%{name}" != "dapl-debug" -%_mandir/man1/dapl-test.1* -%_mandir/man1/dapl-utest.1* -%_mandir/man1/dapl-testcm.1* -%_mandir/man1/dapl-testsrq.1* -%_mandir/man1/dapl-testx.1* -%endif - -%changelog diff --git a/dapl.changes b/dapl.changes index ba6a546..2af0e52 100644 --- a/dapl.changes +++ b/dapl.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Thu May 4 13:18:39 UTC 2023 - Dominique Leuenberger + +- Convert to proper multibuild package: the spec is already all + done to distinguish flavors. + ------------------------------------------------------------------- Sat Jul 14 20:21:56 UTC 2018 - bwiedemann@suse.com diff --git a/dapl.spec b/dapl.spec index f9d5527..fe2ef11 100644 --- a/dapl.spec +++ b/dapl.spec @@ -1,7 +1,7 @@ # -# spec file for package dapl +# spec file # -# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2023 SUSE LLC # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -12,12 +12,17 @@ # license that conforms to the Open Source Definition (Version 1.9) # published by the Open Source Initiative. -# Please submit bugfixes or comments via http://bugs.opensuse.org/ +# Please submit bugfixes or comments via https://bugs.opensuse.org/ # +%define flavor @BUILD_FLAVOR@%{nil} +%if "%{flavor}" != "" +%define nsuffix -%{flavor} +%endif + %define git_version %nil -Name: dapl +Name: dapl%{?nsuffix} Summary: A Library for userspace access to RDMA devices using OS Agnostic DAT APIs License: BSD-3-Clause OR GPL-2.0-or-later OR CPL-1.0 Group: Productivity/Networking/System @@ -35,7 +40,7 @@ Patch13: dapl-add-arm-platform-support.patch Patch14: ucm-mcm-fix-backlog-parameter-for-socket.patch # PATCH-FIX-UPSTREAM http://git.openfabrics.org/?p=~ardavis/dapl.git;a=commitdiff;h=f1e05b7adcee629ee7c1d4d86ea55344d9309232 Patch15: reproducible.patch -Url: http://www.openfabrics.org +URL: http://www.openfabrics.org BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildRequires: autoconf BuildRequires: automake @@ -54,10 +59,10 @@ Conflicts: dapl Obsoletes: dapl-64bit %endif # -Requires(post): /sbin/ldconfig -Requires(postun): /sbin/ldconfig -Requires(post): sed -Requires(post): coreutils +Requires(post): /sbin/ldconfig +Requires(postun):/sbin/ldconfig +Requires(post): sed +Requires(post): coreutils # libdapl*.so work like plugins, hence they do not get a separate subpackage. @@ -144,7 +149,7 @@ autoreconf -fi %if "%name" == "dapl" %configure --disable-static --with-pic %else -%configure --disable-static --with-pic --enable-debug +%configure --disable-static --with-pic --enable-debug %endif make %{?_smp_mflags} V=1 @@ -159,7 +164,7 @@ make DESTDIR=%{buildroot} install rm -f %{buildroot}%_libdir/*.la %if "%{name}" == "dapl-debug" -rm -rf %{buildroot}%{_mandir}/man{1,5}/* +rm -rf %{buildroot}%{_mandir}/man{1,5}/* %endif mkdir -p %{buildroot}%_sysconfdir touch %{buildroot}%_sysconfdir/dat.conf @@ -268,7 +273,7 @@ fi %if "%{name}" != "dapl-debug" %_mandir/man5/dat.conf.5* %endif -%doc +%doc %files -n %lname %defattr(-,root,root) diff --git a/pre_checkin.sh b/pre_checkin.sh deleted file mode 100644 index 2913375..0000000 --- a/pre_checkin.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash -# This script has to be run prior to a check-in if changes were done -# to spec and/or changes -sed -e "s,^\(Name:.*dapl\),\1-debug," dapl.spec > dapl-debug.spec -cp dapl.changes dapl-debug.changes - -osc service localrun format_spec_file -