[PATCHv2 rdma-core 0/5] Packaging: fixes and SUSE support

[PATCHv2 rdma-core 0/5] Packaging: fixes and SUSE support

[Nicolas Morey-Chaisemartin]

This series contains a few fixes for the packaging and add support for RPM packaging on SUSE

Patch 1-3 are fixes
#1 adds a CMake variable to select the patch tot systemd-modules-load
#2 installs udev.md which is referenced in multiple service files
#3 fixes a typo in redhat spec file
#4 adds the SUSE spec file
#5 enable the suse spec file do SUSE build in cbuild

Changes since v1:
- Add packaging fixes
- Several fixes on the SUSE spec file:
  * Drop unneeded service file registering
  * Drop duplicate rdma-ndd udev rule


Nicolas Morey-Chaisemartin (5):
  kernel-boot: Add cmake variable to configure the path to systemd-*
    binaries
  Documentation: install udev.md
  redhat: fix typo in librdacm package description
  suse: Add spec file for SUSE
  cbuild: use SUSE spec file for SUSE targets

 CMakeLists.txt                            |   2 +
 Documentation/CMakeLists.txt              |   1 +
 MAINTAINERS                               |   5 +
 buildlib/cbuild                           |   2 +
 debian/rdma-core.install                  |   1 +
 kernel-boot/rdma-load-modules@.service.in |   2 +-
 redhat/rdma-core.spec                     |   3 +-
 suse/rdma-core.spec                       | 688 ++++++++++++++++++++++++++++++
 8 files changed, 702 insertions(+), 2 deletions(-)
 create mode 100644 suse/rdma-core.spec

-- 
2.14.1.252.gf15771ee3

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCHv2 rdma-core 1/5] kernel-boot: Add cmake variable to configure the path to systemd-* binaries

[Nicolas Morey-Chaisemartin]

Debian uses /lib/systemd
SUSE uses /usr/lib/systemd
RHEL/Fedora can use both.

Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-IBi9RG/b67k@public.gmane.org>
---
 CMakeLists.txt                            | 2 ++
 kernel-boot/rdma-load-modules@.service.in | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2324cf49..a2464ec5 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -74,6 +74,8 @@ set(CMAKE_INSTALL_INITDDIR "${CMAKE_INSTALL_SYSCONFDIR}/init.d"
   CACHE PATH "Location for init.d files")
 set(CMAKE_INSTALL_SYSTEMD_SERVICEDIR "${CMAKE_INSTALL_PREFIX}/lib/systemd/system"
   CACHE PATH "Location for systemd service files")
+set(CMAKE_INSTALL_SYSTEMD_BINDIR "/lib/systemd"
+  CACHE PATH "Location for systemd extra binaries")
 
 set(ACM_PROVIDER_DIR "${CMAKE_INSTALL_FULL_LIBDIR}/ibacm"
   CACHE PATH "Location for ibacm provider plugin shared library files.")
diff --git a/kernel-boot/rdma-load-modules@.service.in b/kernel-boot/rdma-load-modules@.service.in
index d381bc5b..c390a8cc 100644
--- a/kernel-boot/rdma-load-modules@.service.in
+++ b/kernel-boot/rdma-load-modules@.service.in
@@ -21,5 +21,5 @@ ConditionCapability=CAP_SYS_MODULE
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/lib/systemd/systemd-modules-load @CMAKE_INSTALL_FULL_SYSCONFDIR@/rdma/modules/%I.conf
+ExecStart=@CMAKE_INSTALL_SYSTEMD_BINDIR@/systemd-modules-load @CMAKE_INSTALL_FULL_SYSCONFDIR@/rdma/modules/%I.conf
 TimeoutSec=90s
-- 
2.14.1.252.gf15771ee3


--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCHv2 rdma-core 2/5] Documentation: install udev.md

[Nicolas Morey-Chaisemartin]

udev.md is referenced by rdma-hw,target and rdma-load-modules@.service
and needs to be installed.

Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-IBi9RG/b67k@public.gmane.org>
---
 Documentation/CMakeLists.txt | 1 +
 debian/rdma-core.install     | 1 +
 redhat/rdma-core.spec        | 1 +
 3 files changed, 3 insertions(+)

diff --git a/Documentation/CMakeLists.txt b/Documentation/CMakeLists.txt
index 6170b5f2..d6e08ded 100644
--- a/Documentation/CMakeLists.txt
+++ b/Documentation/CMakeLists.txt
@@ -5,6 +5,7 @@ install(FILES
   libibverbs.md
   librdmacm.md
   rxe.md
+  udev.md
   ../README.md
   ../MAINTAINERS
   DESTINATION "${CMAKE_INSTALL_DOCDIR}")
diff --git a/debian/rdma-core.install b/debian/rdma-core.install
index 8f5779a4..87bff10f 100644
--- a/debian/rdma-core.install
+++ b/debian/rdma-core.install
@@ -25,6 +25,7 @@ usr/sbin/rdma-ndd
 usr/share/doc/rdma-core/MAINTAINERS
 usr/share/doc/rdma-core/README.md
 usr/share/doc/rdma-core/rxe.md
+usr/share/doc/rdma-core/udev.md
 usr/share/man/man5/iwpmd.conf.5
 usr/share/man/man7/rxe.7
 usr/share/man/man8/iwpmd.8
diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec
index 61e16de5..ca11f663 100644
--- a/redhat/rdma-core.spec
+++ b/redhat/rdma-core.spec
@@ -319,6 +319,7 @@ rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
 %dir %{_docdir}/%{name}-%{version}
 %doc %{_docdir}/%{name}-%{version}/README.md
 %doc %{_docdir}/%{name}-%{version}/rxe.md
+%doc %{_docdir}/%{name}-%{version}/udev.md
 %config(noreplace) %{_sysconfdir}/rdma/mlx4.conf
 %config(noreplace) %{_sysconfdir}/rdma/modules/infiniband.conf
 %config(noreplace) %{_sysconfdir}/rdma/modules/iwarp.conf
-- 
2.14.1.252.gf15771ee3


--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCHv2 rdma-core 3/5] redhat: fix typo in librdacm package description

[Nicolas Morey-Chaisemartin]

Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-IBi9RG/b67k@public.gmane.org>
---
 redhat/rdma-core.spec | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec
index ca11f663..cc0c3ba0 100644
--- a/redhat/rdma-core.spec
+++ b/redhat/rdma-core.spec
@@ -183,7 +183,7 @@ Summary: Userspace RDMA Connection Manager
 Requires: %{name}%{?_isa} = %{version}-%{release}
 
 %description -n librdmacm
-librdmacm provides a userspace RDMA Communication Managment API.
+librdmacm provides a userspace RDMA Communication Management API.
 
 %package -n librdmacm-utils
 Summary: Examples for the librdmacm library
-- 
2.14.1.252.gf15771ee3


--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCHv2 rdma-core 4/5] suse: Add spec file for SUSE

[Nicolas Morey-Chaisemartin]

Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-IBi9RG/b67k@public.gmane.org>
---
 MAINTAINERS         |   5 +
 suse/rdma-core.spec | 688 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 693 insertions(+)
 create mode 100644 suse/rdma-core.spec

diff --git a/MAINTAINERS b/MAINTAINERS
index 19fe88df..08286cb5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -166,6 +166,11 @@ M:	Bart Van Assche <bvanassche-HInyCGIudOg@public.gmane.org>
 S:	Supported
 F:	srp_daemon/
 
+SUSE PACKAGING
+M:	Nicolas Morey-Chaisemartin <nmoreychaisemartin-l3A5Bk7waGM@public.gmane.org>
+S:	Supported
+F:	suse/
+
 VMWARE PVRDMA USERSPACE PROVIDER (for vmw_pvrdma.ko)
 M:	Adit Ranadive <aditr-pghWNbHTmq7QT0dZR+AlfA@public.gmane.org>
 L:	pv-drivers-pghWNbHTmq7QT0dZR+AlfA@public.gmane.org
diff --git a/suse/rdma-core.spec b/suse/rdma-core.spec
new file mode 100644
index 00000000..76ca7286
--- /dev/null
+++ b/suse/rdma-core.spec
@@ -0,0 +1,688 @@
+#
+# spec file for package rdma-core
+#
+# 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
+# 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/
+#
+
+
+%bcond_without  systemd
+%define         git_ver %{nil}
+Name:           rdma-core
+Version:        15
+Release:        0
+Summary:        RDMA core userspace libraries and daemons
+License:        GPL-2.0 or BSD-2-Clause
+Group:          Productivity/Networking/Other
+
+%define verbs_so_major  1
+%define ibcm_so_major   1
+%define rdmacm_so_major 1
+%define umad_so_major   3
+%define mlx4_so_major   1
+%define mlx5_so_major   1
+
+%define  verbs_lname  libibverbs%{verbs_so_major}
+%define  ibcm_lname   libibcm%{ibcm_so_major}
+%define  rdmacm_lname librdmacm%{rdmacm_so_major}
+%define  umad_lname   libibumad%{umad_so_major}
+%define  mlx4_lname   libmlx4-%{mlx4_so_major}
+%define  mlx5_lname   libmlx5-%{mlx5_so_major}
+
+%ifnarch s390 %arm
+%define dma_coherent 1
+%endif
+
+# Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
+#  providers/ipathverbs/ Dual licensed using a BSD license with an extra patent clause
+#  providers/rxe/ Incorporates code from ipathverbs and contains the patent clause
+#  providers/hfi1verbs Uses the 3 Clause BSD license
+Url:            https://github.com/linux-rdma/rdma-core
+Source:         rdma-core-%{version}%{git_ver}.tar.gz
+Source1:        baselibs.conf
+BuildRequires:  binutils
+BuildRequires:  cmake >= 2.8.11
+BuildRequires:  gcc
+BuildRequires:  pkgconfig
+BuildRequires:  pkgconfig(libsystemd)
+BuildRequires:  pkgconfig(libudev)
+BuildRequires:  pkgconfig(systemd)
+%ifnarch s390 s390x
+BuildRequires:  valgrind-devel
+%endif
+BuildRequires:  systemd-rpm-macros
+BuildRequires:  pkgconfig(libnl-3.0)
+BuildRequires:  pkgconfig(libnl-route-3.0)
+BuildRequires:  pkgconfig(systemd)
+Requires:       dracut
+Requires:       kmod
+Requires:       systemd
+
+# SUSE previously shipped rdma as a stand-alone
+# package which we're supplanting here.
+
+Provides:       rdma = %{version}
+Obsoletes:      rdma < %{version}
+Provides:       ofed = %{version}
+Obsoletes:      ofed < %{version}
+
+%if 0%{?suse_version} >= 1330
+BuildRequires:  curl-mini
+%endif
+
+# Tumbleweed's cmake RPM macro adds -Wl,--no-undefined to the module flags
+# which is totally inappropriate and breaks building 'ENABLE_EXPORTS' style
+# module libraries (eg ibacmp).
+#%%define CMAKE_FLAGS -DCMAKE_MODULE_LINKER_FLAGS=""
+
+# Since we recommend developers use Ninja, so should packagers, for consistency.
+%define CMAKE_FLAGS %{nil}
+%if 0%{?suse_version} >= 1300
+BuildRequires:  ninja
+%define CMAKE_FLAGS -GNinja
+%define make_jobs ninja -v %{?_smp_mflags}
+%define cmake_install DESTDIR=%{buildroot} ninja install
+%else
+# Fallback to make otherwise
+BuildRequires:  make
+%define make_jobs make -v %{?_smp_mflags}
+%define cmake_install DESTDIR=%{buildroot} make install
+%endif
+
+%description
+RDMA core userspace infrastructure and documentation, including initialization
+scripts, kernel driver-specific modprobe override configs, IPoIB network
+scripts, dracut rules, and the rdma-ndd utility.
+
+%package devel
+Summary:        RDMA core development libraries and headers
+Group:          Development/Libraries/C and C++
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+
+Requires:       %{ibcm_lname} = %{version}-%{release}
+Requires:       %{rdmacm_lname} = %{version}-%{release}
+Requires:       %{umad_lname} = %{version}-%{release}
+Requires:       %{verbs_lname} = %{version}-%{release}
+%%if 0%{?dma_coherent}
+Requires:       %{mlx4_lname} = %{version}-%{release}
+Requires:       %{mlx5_lname} = %{version}-%{release}
+%endif
+Requires:       rsocket = %{version}-%{release}
+
+Provides:       libibverbs-devel = %{version}-%{release}
+Obsoletes:      libibverbs-devel < %{version}-%{release}
+
+Provides:       libibcm-devel = %{version}-%{release}
+Obsoletes:      libibcm-devel < %{version}-%{release}
+
+Provides:       libibumad-devel = %{version}-%{release}
+Obsoletes:      libibumad-devel < %{version}-%{release}
+Provides:       librdmacm-devel = %{version}-%{release}
+
+Obsoletes:      librdmacm-devel < %{version}-%{release}
+#Requires:       ibacm = %%{version}-%%{release}
+Provides:       ibacm-devel = %{version}-%{release}
+Obsoletes:      ibacm-devel < %{version}-%{release}
+
+%description devel
+RDMA core development libraries and headers.
+
+%package -n     libibverbs
+Summary:        Library & drivers for direct userspace use of InfiniBand/iWARP/RoCE hardware
+Group:          System/Libraries
+Requires:       %{name}%{?_isa} = %{version}-%{release}
+Obsoletes:      libcxgb3-rdmav2 < %{version}-%{release}
+Obsoletes:      libcxgb4-rdmav2 < %{version}-%{release}
+Obsoletes:      libhfi1verbs-rdmav2 < %{version}-%{release}
+Obsoletes:      libi40iw-rdmav2 < %{version}-%{release}
+Obsoletes:      libipathverbs-rdmav2 < %{version}-%{release}
+Obsoletes:      libmlx4-rdmav2 < %{version}-%{release}
+Obsoletes:      libmlx5-rdmav2 < %{version}-%{release}
+Obsoletes:      libmthca-rdmav2 < %{version}-%{release}
+Obsoletes:      libnes-rdmav2 < %{version}-%{release}
+Obsoletes:      libocrdma-rdmav2 < %{version}-%{release}
+Obsoletes:      librxe-rdmav2 < %{version}-%{release}
+%if 0%{?dma_coherent}
+Requires:       %{mlx4_lname} = %{version}-%{release}
+Requires:       %{mlx5_lname} = %{version}-%{release}
+%endif
+
+%description -n libibverbs
+libibverbs is a library that allows userspace processes to use RDMA
+"verbs" as described in the InfiniBand Architecture Specification and
+the RDMA Protocol Verbs Specification.  This includes direct hardware
+access from userspace to InfiniBand/iWARP adapters (kernel bypass) for
+fast path operations.
+
+Device-specific plug-in ibverbs userspace drivers are included:
+
+- libcxgb3: Chelsio T3 iWARP HCA
+- libcxgb4: Chelsio T4 iWARP HCA
+- libhfi1: Intel Omni-Path HFI
+- libhns: HiSilicon Hip06 SoC
+- libi40iw: Intel Ethernet Connection X722 RDMA
+- libipathverbs: QLogic InfiniPath HCA
+- libmlx4: Mellanox ConnectX-3 InfiniBand HCA
+- libmlx5: Mellanox Connect-IB/X-4+ InfiniBand HCA
+- libmthca: Mellanox InfiniBand HCA
+- libnes: NetEffect RNIC
+- libocrdma: Emulex OneConnect RDMA/RoCE Device
+- libqedr: QLogic QL4xxx RoCE HCA
+- librxe: A software implementation of the RoCE protocol
+- libvmw_pvrdma: VMware paravirtual RDMA device
+
+%package -n %verbs_lname
+Summary:        Ibverbs runtime library
+Group:          System/Libraries
+Requires:       libibverbs = %{version}
+
+%description -n %verbs_lname
+This package contains the ibverbs runtime library.
+
+%if 0%{?dma_coherent}
+%package -n %mlx4_lname
+Summary:        MLX4 runtime library
+Group:          System/Libraries
+
+%description -n %mlx4_lname
+This package contains the mlx4 runtime library.
+
+%package -n %mlx5_lname
+Summary:        MLX5 runtime library
+Group:          System/Libraries
+
+%description -n %mlx5_lname
+This package contains the mlx5 runtime library.
+%endif
+
+%package -n     libibverbs-utils
+Summary:        Examples for the libibverbs library
+Group:          Productivity/Networking/Other
+Requires:       libibverbs%{?_isa} = %{version}
+
+%description -n libibverbs-utils
+Useful libibverbs example programs such as ibv_devinfo, which
+displays information about RDMA devices.
+
+%package -n     ibacm
+Summary:        InfiniBand Communication Manager Assistant
+Group:          Productivity/Networking/Other
+%{?systemd_requires}
+Requires:       %{name}%{?_isa} = %{version}
+Obsoletes:      libibacmp1 < %{version}
+Provides:       libibacmp1 = %{version}
+
+%description -n ibacm
+The ibacm daemon helps reduce the load of managing path record lookups on
+large InfiniBand fabrics by providing a user space implementation of what
+is functionally similar to an ARP cache.  The use of ibacm, when properly
+configured, can reduce the SA packet load of a large IB cluster from O(n^2)
+to O(n).  The ibacm daemon is started and normally runs in the background,
+user applications need not know about this daemon as long as their app
+uses librdmacm to handle connection bring up/tear down.  The librdmacm
+library knows how to talk directly to the ibacm daemon to retrieve data.
+
+%package -n iwpmd
+Summary:        Userspace iWarp Port Mapper daemon
+Group:          Development/Libraries/C and C++
+Requires:       %{name}%{?_isa} = %{version}
+%{?systemd_requires}
+
+%description -n iwpmd
+iwpmd provides a userspace service for iWarp drivers to claim
+tcp ports through the standard socket interface.
+
+%package -n %ibcm_lname
+Summary:        Userspace InfiniBand Connection Manager
+Group:          System/Libraries
+
+%description -n %ibcm_lname
+libibcm provides a userspace library that handles the majority of the low
+level work required to open an RDMA connection between two machines.
+
+%package -n %umad_lname
+Summary:        OpenFabrics Alliance InfiniBand Userspace Management Datagram library
+Group:          System/Libraries
+
+%description -n %umad_lname
+libibumad provides the userspace management datagram (umad) library
+functions, which sit on top of the umad modules in the kernel. These
+are used by the IB diagnostic and management tools, including OpenSM.
+
+%package -n     %rdmacm_lname
+Summary:        Userspace RDMA Connection Manager
+Group:          System/Libraries
+Requires:       %{name} = %{version}
+
+%description -n %rdmacm_lname
+librdmacm provides a userspace RDMA Communication Management API.
+
+%package -n rsocket
+Summary:        Preloadable library to turn the socket API RDMA-aware
+Group:          System/Libraries
+
+%description -n rsocket
+Existing applications can make use of rsockets through the use this
+preloadable library. See the documentation in the packaged rsocket(7)
+manpage for details.
+
+%package -n librdmacm-utils
+Summary:        Examples for the librdmacm library
+Group:          Productivity/Networking/Other
+
+%description -n librdmacm-utils
+Example test programs for the librdmacm library.
+
+%package -n srp_daemon
+Summary:        Tools for using the InfiniBand SRP protocol devices
+Group:          Development/Libraries/C and C++
+Requires:       %{name} = %{version}
+Obsoletes:      srptools <= 1.0.3
+Provides:       srptools = %{version}
+%{?systemd_requires}
+
+%description -n srp_daemon
+In conjunction with the kernel ib_srp driver, srp_daemon allows you to
+discover and use SCSI devices via the SCSI RDMA Protocol over InfiniBand.
+
+%package     -n rdma-ndd
+Summary:        Daemon to manage RDMA Node Description
+Group:          System/Daemons
+Requires:       %{name} = %{version}
+# The udev rules in rdma need to be aware of rdma-ndd:
+Conflicts:      rdma < 2.1
+%{?systemd_requires}
+
+%description -n rdma-ndd
+rdma-ndd is a system daemon which watches for rdma device changes and/or
+hostname changes and updates the Node Description of the rdma devices based
+on those changes.
+
+%prep
+%setup -q -n  %{name}-%{version}%{git_ver}
+
+%build
+
+# New RPM defines _rundir, usually as /run
+%if 0%{?_rundir:1}
+%else
+%define _rundir /var/run
+%endif
+
+# Pass all of the rpm paths directly to GNUInstallDirs and our other defines.
+%cmake %{CMAKE_FLAGS} \
+	 -DCMAKE_MODULE_LINKER_FLAGS="-Wl,--as-needed -Wl,-z,now" \
+         -DCMAKE_BUILD_TYPE=Release \
+         -DCMAKE_INSTALL_BINDIR:PATH=%{_bindir} \
+         -DCMAKE_INSTALL_SBINDIR:PATH=%{_sbindir} \
+         -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
+         -DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \
+         -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=%{_localstatedir} \
+         -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=%{_sharedstatedir} \
+         -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \
+         -DCMAKE_INSTALL_INFODIR:PATH=%{_infodir} \
+         -DCMAKE_INSTALL_MANDIR:PATH=%{_mandir} \
+         -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \
+         -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{_unitdir} \
+         -DCMAKE_INSTALL_SYSTEMD_BINDIR:PATH=%{_libexecdir}/systemd \
+         -DCMAKE_INSTALL_INITDDIR:PATH=%{_initddir} \
+         -DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \
+         -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \
+         -DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir}
+%make_jobs
+
+%install
+cd build
+%cmake_install
+cd ..
+mkdir -p %{buildroot}/%{_sysconfdir}/rdma
+
+%global dracutlibdir %%{_sysconfdir}/dracut.conf.d
+%global sysmodprobedir %%{_sysconfdir}/modprobe.d
+
+mkdir -p %{buildroot}%{_libexecdir}/udev/rules.d
+mkdir -p %{buildroot}%{_udevrulesdir}
+mkdir -p %{buildroot}%{dracutlibdir}/modules.d/05rdma
+mkdir -p %{buildroot}%{sysmodprobedir}
+mkdir -p %{buildroot}%{_unitdir}
+
+install -D -m0644 redhat/rdma.conf %{buildroot}/%{_sysconfdir}/rdma/rdma.conf
+sed 's%/usr/libexec%/usr/lib%' redhat/rdma.service > %{buildroot}%{_unitdir}/rdma.service
+chmod 0644 %{buildroot}%{_unitdir}/rdma.service
+install -D -m0644 redhat/rdma.sriov-vfs %{buildroot}/%{_sysconfdir}/rdma/sriov-vfs
+install -D -m0644 redhat/rdma.mlx4.conf %{buildroot}/%{_sysconfdir}/rdma/mlx4.conf
+install -D -m0644 redhat/rdma.udev-ipoib-naming.rules %{buildroot}%{_udevrulesdir}/70-persistent-ipoib.rules
+sed 's%/usr/libexec%/usr/lib%g' redhat/rdma.modules-setup.sh > %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh
+chmod 0755 %{buildroot}%{dracutlibdir}/modules.d/05rdma/module-setup.sh
+install -D -m0644 redhat/rdma.udev-rules %{buildroot}%{_udevrulesdir}/98-rdma.rules
+sed 's%/usr/libexec%/usr/lib%g' redhat/rdma.mlx4.sys.modprobe > %{buildroot}%{sysmodprobedir}/50-libmlx4.conf
+chmod 0644 %{buildroot}%{sysmodprobedir}/50-libmlx4.conf
+
+sed 's%/usr/libexec%/usr/lib%g' redhat/rdma.kernel-init > %{buildroot}%{_libexecdir}/rdma-init-kernel
+chmod 0755 %{buildroot}%{_libexecdir}/rdma-init-kernel
+install -D -m0755 redhat/rdma.sriov-init %{buildroot}%{_libexecdir}/rdma-set-sriov-vf
+install -D -m0644 redhat/rdma.fixup-mtrr.awk %{buildroot}%{_libexecdir}/rdma-fixup-mtrr.awk
+install -D -m0755 redhat/rdma.mlx4-setup.sh %{buildroot}%{_libexecdir}/mlx4-setup.sh
+
+mv %{buildroot}%{_sysconfdir}/modprobe.d/truescale.conf %{buildroot}%{_sysconfdir}/modprobe.d/50-truescale.conf
+%if 0%{?dma_coherent}
+mv %{buildroot}%{_sysconfdir}/modprobe.d/mlx4.conf %{buildroot}%{_sysconfdir}/modprobe.d/50-mlx4.conf
+%endif
+
+# ibacm
+cd build
+LD_LIBRARY_PATH=./lib bin/ib_acme -D . -O
+install -D -m0644 ibacm_opts.cfg %{buildroot}%{_sysconfdir}/rdma/
+
+for service in rdma rdma-ndd ibacm iwpmd srp_daemon; do ln -sf %{_sbindir}/service %{buildroot}%{_sbindir}/rc${service}; done
+
+# Delete the package's init.d scripts
+rm -rf %{buildroot}/%{_initddir}/
+rm -rf %{buildroot}/%{_sbindir}/srp_daemon.sh
+
+%post -n %verbs_lname -p /sbin/ldconfig
+%postun -n %verbs_lname -p /sbin/ldconfig
+
+%if 0%{?dma_coherent}
+%post -n %mlx4_lname -p /sbin/ldconfig
+%postun -n %mlx4_lname -p /sbin/ldconfig
+
+%post -n %mlx5_lname -p /sbin/ldconfig
+%postun -n %mlx5_lname -p /sbin/ldconfig
+%endif
+
+%post -n %ibcm_lname -p /sbin/ldconfig
+%postun -n %ibcm_lname -p /sbin/ldconfig
+
+%post -n %umad_lname -p /sbin/ldconfig
+%postun -n %umad_lname -p /sbin/ldconfig
+
+%post -n %rdmacm_lname -p /sbin/ldconfig
+%postun -n %rdmacm_lname -p /sbin/ldconfig
+
+%pre
+%service_add_pre rdma.service
+
+%post
+%service_add_post rdma.service
+
+%preun
+%service_del_preun -n rdma.service
+
+%postun
+%service_del_postun -n rdma.service
+
+#
+# ibacm
+#
+%pre -n ibacm
+%service_add_pre ibacm.service ibacm.socket
+
+%post -n ibacm
+%service_add_post ibacm.service ibacm.socket
+
+%preun -n ibacm
+%service_del_preun ibacm.service ibacm.socket
+
+%postun -n ibacm
+%service_del_postun ibacm.service ibacm.socket
+
+#
+# srp daemon
+#
+%pre -n srp_daemon
+%service_add_pre srp_daemon.service srp_daemon_port@.service
+
+%post -n srp_daemon
+%service_add_post srp_daemon.service srp_daemon_port@.service
+
+%preun -n srp_daemon
+%service_del_preun srp_daemon.service srp_daemon_port@.service
+
+%postun -n srp_daemon
+%service_del_postun srp_daemon.service srp_daemon_port@.service
+
+#
+# iwpmd
+#
+%pre -n iwpmd
+%service_add_pre ibiwpmd.service
+
+%post -n iwpmd
+%service_add_post iwpmd.service
+
+%preun -n iwpmd
+%service_del_preun iwpmd.service
+
+%postun -n iwpmd
+%service_del_postun iwpmd.service
+
+#
+# rdma-ndd
+#
+%pre -n rdma-ndd
+%service_add_pre rdma-ndd.service
+
+%preun -n rdma-ndd
+%service_del_preun rdma-ndd.service
+
+%post -n rdma-ndd
+%service_add_post rdma-ndd.service
+
+%postun -n rdma-ndd
+%service_del_postun rdma-ndd.service
+
+%files
+%defattr(-,root,root)
+%dir %{_sysconfdir}/rdma
+%dir %{_sysconfdir}/rdma/modules
+%dir %{_docdir}/%{name}-%{version}
+%dir %{_libexecdir}/udev
+%dir %{_libexecdir}/udev/rules.d
+%dir %{_sysconfdir}/modprobe.d
+%doc %{_docdir}/%{name}-%{version}/README.md
+%config(noreplace) %{_sysconfdir}/rdma/mlx4.conf
+%config(noreplace) %{_sysconfdir}/rdma/modules/infiniband.conf
+%config(noreplace) %{_sysconfdir}/rdma/modules/iwarp.conf
+%config(noreplace) %{_sysconfdir}/rdma/modules/opa.conf
+%config(noreplace) %{_sysconfdir}/rdma/modules/rdma.conf
+%config(noreplace) %{_sysconfdir}/rdma/modules/roce.conf
+%config(noreplace) %{_sysconfdir}/rdma/rdma.conf
+%config(noreplace) %{_sysconfdir}/rdma/sriov-vfs
+%if 0%{?dma_coherent}
+%config(noreplace) %{_sysconfdir}/modprobe.d/50-mlx4.conf
+%endif
+%config(noreplace) %{_sysconfdir}/modprobe.d/50-truescale.conf
+%{_unitdir}/rdma-hw.target
+%{_unitdir}/rdma-load-modules@.service
+%{_unitdir}/rdma.service
+%dir %{dracutlibdir}
+%dir %{dracutlibdir}/modules.d
+%dir %{dracutlibdir}/modules.d/05rdma
+%{dracutlibdir}/modules.d/05rdma/module-setup.sh
+%{_udevrulesdir}/70-persistent-ipoib.rules
+%{_udevrulesdir}/75-rdma-description.rules
+%{_udevrulesdir}/90-rdma-hw-modules.rules
+%{_udevrulesdir}/90-rdma-ulp-modules.rules
+%{_udevrulesdir}/90-rdma-umad.rules
+%{_udevrulesdir}/98-rdma.rules
+%config %{sysmodprobedir}/50-libmlx4.conf
+%{_libexecdir}/rdma-init-kernel
+%{_libexecdir}/rdma-set-sriov-vf
+%{_libexecdir}/rdma-fixup-mtrr.awk
+%{_libexecdir}/mlx4-setup.sh
+%{_libexecdir}/truescale-serdes.cmds
+%license COPYING.*
+%{_sbindir}/rcrdma
+
+%files devel
+%defattr(-,root,root)
+%doc %{_docdir}/%{name}-%{version}/MAINTAINERS
+%dir %{_includedir}/infiniband
+%dir %{_includedir}/rdma
+%{_includedir}/infiniband/*
+%{_includedir}/rdma/*
+%{_libdir}/lib*.so
+%{_mandir}/man3/ibv_*
+%{_mandir}/man3/rdma*
+%{_mandir}/man3/umad*
+%{_mandir}/man3/*_to_ibv_rate.*
+%{_mandir}/man7/rdma_cm.*
+%if 0%{?dma_coherent}
+%{_mandir}/man3/mlx5dv*
+%{_mandir}/man3/mlx4dv*
+%{_mandir}/man7/mlx5dv*
+%{_mandir}/man7/mlx4dv*
+%endif
+
+%files -n libibverbs
+%defattr(-,root,root)
+%dir %{_sysconfdir}/libibverbs.d
+%dir %{_libdir}/libibverbs
+%{_libdir}/libibverbs/*.so
+%config(noreplace) %{_sysconfdir}/libibverbs.d/*.driver
+%doc %{_docdir}/%{name}-%{version}/libibverbs.md
+%doc %{_docdir}/%{name}-%{version}/rxe.md
+%doc %{_docdir}/%{name}-%{version}/udev.md
+%{_bindir}/rxe_cfg
+%{_mandir}/man7/rxe*
+%{_mandir}/man8/rxe*
+
+%files -n %verbs_lname
+%defattr(-,root,root)
+%{_libdir}/libibverbs*.so.*
+
+%if 0%{?dma_coherent}
+%files -n %mlx4_lname
+%defattr(-,root,root)
+%{_libdir}/libmlx4*.so.*
+
+%files -n %mlx5_lname
+%defattr(-,root,root)
+%{_libdir}/libmlx5*.so.*
+%endif
+
+%files -n libibverbs-utils
+%defattr(-,root,root)
+%{_bindir}/ibv_*
+%{_mandir}/man1/ibv_*
+
+%files -n ibacm
+%defattr(-,root,root)
+%config(noreplace) %{_sysconfdir}/rdma/ibacm_opts.cfg
+%{_bindir}/ib_acme
+%{_sbindir}/ibacm
+%{_mandir}/man1/ibacm.*
+%{_mandir}/man1/ib_acme.*
+%{_mandir}/man7/ibacm.*
+%{_mandir}/man7/ibacm_prov.*
+%{_unitdir}/ibacm.service
+%{_unitdir}/ibacm.socket
+%dir %{_libdir}/ibacm
+%{_libdir}/ibacm/*
+%{_sbindir}/rcibacm
+%doc %{_docdir}/%{name}-%{version}/ibacm.md
+
+%files -n iwpmd
+%defattr(-,root,root)
+%dir %{_sysconfdir}/rdma
+%dir %{_sysconfdir}/rdma/modules
+%{_sbindir}/iwpmd
+%{_sbindir}/rciwpmd
+%{_unitdir}/iwpmd.service
+%config(noreplace) %{_sysconfdir}/rdma/modules/iwpmd.conf
+%config(noreplace) %{_sysconfdir}/iwpmd.conf
+%{_udevrulesdir}/90-iwpmd.rules
+%{_mandir}/man8/iwpmd.*
+%{_mandir}/man5/iwpmd.*
+
+%files -n %ibcm_lname
+%defattr(-,root,root)
+%{_libdir}/libibcm*.so.*
+%doc %{_docdir}/%{name}-%{version}/libibcm.md
+
+%files -n %umad_lname
+%defattr(-,root,root)
+%{_libdir}/libibumad*.so.*
+
+%files -n %rdmacm_lname
+%defattr(-,root,root)
+%{_libdir}/librdmacm*.so.*
+%doc %{_docdir}/%{name}-%{version}/librdmacm.md
+
+%files -n rsocket
+%defattr(-,root,root)
+%dir %{_libdir}/rsocket
+%{_libdir}/rsocket/*.so*
+%{_mandir}/man7/rsocket.*
+
+%files -n librdmacm-utils
+%defattr(-,root,root)
+%{_bindir}/cmtime
+%{_bindir}/mckey
+%{_bindir}/rcopy
+%{_bindir}/rdma_client
+%{_bindir}/rdma_server
+%{_bindir}/rdma_xclient
+%{_bindir}/rdma_xserver
+%{_bindir}/riostream
+%{_bindir}/rping
+%{_bindir}/rstream
+%{_bindir}/ucmatose
+%{_bindir}/udaddy
+%{_bindir}/udpong
+%{_mandir}/man1/cmtime.*
+%{_mandir}/man1/mckey.*
+%{_mandir}/man1/rcopy.*
+%{_mandir}/man1/rdma_client.*
+%{_mandir}/man1/rdma_server.*
+%{_mandir}/man1/rdma_xclient.*
+%{_mandir}/man1/rdma_xserver.*
+%{_mandir}/man1/riostream.*
+%{_mandir}/man1/rping.*
+%{_mandir}/man1/rstream.*
+%{_mandir}/man1/ucmatose.*
+%{_mandir}/man1/udaddy.*
+%{_mandir}/man1/udpong.*
+
+%files -n srp_daemon
+%defattr(-,root,root)
+%dir %{_libexecdir}/srp_daemon
+%dir %{_sysconfdir}/rdma
+%dir %{_sysconfdir}/rdma/modules
+%config(noreplace) %{_sysconfdir}/srp_daemon.conf
+%config(noreplace) %{_sysconfdir}/rdma/modules/srp_daemon.conf
+%{_libexecdir}/udev/rules.d/60-srp_daemon.rules
+%{_libexecdir}/srp_daemon/start_on_all_ports
+%{_unitdir}/srp_daemon.service
+%{_unitdir}/srp_daemon_port@.service
+%{_sbindir}/ibsrpdm
+%{_sbindir}/srp_daemon
+%{_sbindir}/run_srp_daemon
+%{_sbindir}/rcsrp_daemon
+%{_mandir}/man1/ibsrpdm.1*
+%{_mandir}/man1/srp_daemon.1*
+%{_mandir}/man5/srp_daemon.service.5*
+%{_mandir}/man5/srp_daemon_port@.service.5*
+%doc %{_docdir}/%{name}-%{version}/ibsrpdm.md
+
+%files -n rdma-ndd
+%defattr(-, root, root)
+%{_sbindir}/rdma-ndd
+%{_sbindir}/rcrdma-ndd
+%{_unitdir}/rdma-ndd.service
+%{_mandir}/man8/rdma-ndd.*
+%{_mandir}/man8/rdma-ndd.8*
+%{_libexecdir}/udev/rules.d/60-rdma-ndd.rules
+
+%changelog
-- 
2.14.1.252.gf15771ee3


--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCHv2 rdma-core 5/5] cbuild: use SUSE spec file for SUSE targets

[Nicolas Morey-Chaisemartin]

Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-IBi9RG/b67k@public.gmane.org>
---
 buildlib/cbuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/buildlib/cbuild b/buildlib/cbuild
index 86a5e42d..4c3ef36b 100755
--- a/buildlib/cbuild
+++ b/buildlib/cbuild
@@ -293,6 +293,7 @@ class ZypperEnvironment(Environment):
 
 class leap(ZypperEnvironment):
     docker_parent = "opensuse:42.2";
+    specfile = "suse/rdma-core.spec";
     pkgs = {
         'cmake',
         'gcc',
@@ -313,6 +314,7 @@ class tumbleweed(ZypperEnvironment):
     docker_parent = "opensuse:tumbleweed";
     pkgs = leap.pkgs;
     name = "tumbleweed";
+    specfile = "suse/rdma-core.spec";
 
 # -------------------------------------------------------------------------
 
-- 
2.14.1.252.gf15771ee3

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCHv2 rdma-core 5/5] cbuild: use SUSE spec file for SUSE targets

[Jason Gunthorpe]

On Fri, Aug 25, 2017 at 12:40:14PM +0200, Nicolas Morey-Chaisemartin wrote:
> Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-IBi9RG/b67k@public.gmane.org>
>  buildlib/cbuild | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/buildlib/cbuild b/buildlib/cbuild
> index 86a5e42d..4c3ef36b 100755
> +++ b/buildlib/cbuild
> @@ -293,6 +293,7 @@ class ZypperEnvironment(Environment):
>  
>  class leap(ZypperEnvironment):
>      docker_parent = "opensuse:42.2";
> +    specfile = "suse/rdma-core.spec";
>      pkgs = {
>          'cmake',
>          'gcc',
> @@ -313,6 +314,7 @@ class tumbleweed(ZypperEnvironment):
>      docker_parent = "opensuse:tumbleweed";
>      pkgs = leap.pkgs;
>      name = "tumbleweed";
> +    specfile = "suse/rdma-core.spec";
>  
>  # -------------------------------------------------------------------------

Would you add another patch to delete the top level rdma-core.spec
please?

Nothing uses it now.

Jason
--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCHv2 rdma-core 6/6] rdma-core.spec: remove top spec file

[Nicolas Morey-Chaisemartin]

It is now unused as both redhat and suse provide theirs.
Update versioning documentation for the new files.

Signed-off-by: Nicolas Morey-Chaisemartin <NMoreyChaisemartin-IBi9RG/b67k@public.gmane.org>
---
 Documentation/versioning.md |  49 ++++++++-------
 rdma-core.spec              | 146 --------------------------------------------
 2 files changed, 26 insertions(+), 169 deletions(-)
 delete mode 100644 rdma-core.spec

diff --git a/Documentation/versioning.md b/Documentation/versioning.md
index dca092d7..1d4a41b8 100644
--- a/Documentation/versioning.md
+++ b/Documentation/versioning.md
@@ -17,50 +17,53 @@ When the PACKAGE_VERSION is changed, the packaging files should be updated:
 
 ```diff
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 8f7a47580f7b95..45cbc4e018b296 100644
+index a2464ec5..cf237904 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -44,7 +44,7 @@ endif()
  set(PACKAGE_NAME "RDMA")
  
  # See Documentation/versioning.md
--set(PACKAGE_VERSION "12")
-+set(PACKAGE_VERSION "13")
- 
- #-------------------------
- # Basic standard paths
+-set(PACKAGE_VERSION "14")
++set(PACKAGE_VERSION "15")
+ # When this is changed the values in these files need changing too:
+ #   debian/libibverbs1.symbols
+ #   libibverbs/libibverbs.map
 diff --git a/debian/changelog b/debian/changelog
-index 6cabcc483ca85e..3defc050c5e457 100644
+index 86b402f4..9ee7fe16 100644
 --- a/debian/changelog
 +++ b/debian/changelog
 @@ -1,4 +1,4 @@
--rdma-core (12-1) unstable; urgency=low
-+rdma-core (13-1) unstable; urgency=low
+-rdma-core (14-1) unstable; urgency=low
++rdma-core (15-1) unstable; urgency=low
  
    * New version.
    * Adding debian/copyright.
-diff --git a/rdma-core.spec b/rdma-core.spec
-index 41eedb2813c52d..6519bc370a230a 100644
---- a/rdma-core.spec
-+++ b/rdma-core.spec
-@@ -1,5 +1,5 @@
- Name: rdma-core
--Version: 12
-+Version: 13
- Release: 1%{?dist}
- Summary: RDMA core userspace libraries and daemons
- 
 diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec
-index 4271e7c9817e67..f2198ee3cd9410 100644
+index cc0c3ba0..62334730 100644
 --- a/redhat/rdma-core.spec
 +++ b/redhat/rdma-core.spec
 @@ -1,5 +1,5 @@
  Name: rdma-core
--Version: 12
-+Version: 13
+-Version: 14
++Version: 15
  Release: 1%{?dist}
  Summary: RDMA core userspace libraries and daemons
  
+diff --git a/suse/rdma-core.spec b/suse/rdma-core.spec
+index 76ca7286..a19f9e01 100644
+--- a/suse/rdma-core.spec
++++ b/suse/rdma-core.spec
+@@ -19,7 +19,7 @@
+ %bcond_without  systemd
+ %define         git_ver %{nil}
+ Name:           rdma-core
+-Version:        14
++Version:        15
+ Release:        0
+ Summary:        RDMA core userspace libraries and daemons
+ License:        GPL-2.0 or BSD-2-Clause
+
 ```
 
 # Shared Library Versions
diff --git a/rdma-core.spec b/rdma-core.spec
deleted file mode 100644
index 47e1ebe6..00000000
--- a/rdma-core.spec
+++ /dev/null
@@ -1,146 +0,0 @@
-Name: rdma-core
-Version: 15
-Release: 1%{?dist}
-Summary: RDMA core userspace libraries and daemons
-
-# Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license
-#  providers/ipathverbs/ Dual licensed using a BSD license with an extra patent clause
-#  providers/rxe/ Incorporates code from ipathverbs and contains the patent clause
-#  providers/hfi1verbs Uses the 3 Clause BSD license
-License: (GPLv2 or BSD) and (GPLv2 or PathScale-BSD)
-Url: https://github.com/linux-rdma/rdma-core
-Source: rdma-core-%{version}.tgz
-
-BuildRequires: binutils
-BuildRequires: cmake >= 2.8.11
-BuildRequires: gcc
-BuildRequires: libudev-devel
-BuildRequires: pkgconfig
-BuildRequires: pkgconfig(libnl-3.0)
-BuildRequires: pkgconfig(libnl-route-3.0)
-BuildRequires: valgrind-devel
-BuildRequires: python
-%if 0%{?_unitdir:1}
-BuildRequires: systemd-devel
-%endif
-
-# Since we recommend developers use Ninja, so should packagers, for consistency.
-%define CMAKE_FLAGS %{nil}
-%if 0%{?suse_version}
-# SuSE releases have it, and sometime around cmake 3.3.2-1.2 the macros learned to use it.
-BuildRequires: ninja,make
-%define __builder ninja
-# cmake_install is specified by opensuse. It also specifies make_jobs, but it
-# doesn't work with __builder as other rpm macro packages define it too.
-%define make_jobs ninja -v %{?_smp_mflags}
-
-# Tumbleweed's cmake RPM macro adds -Wl,--no-undefined to the module flags
-# which is totally inappropriate and breaks building 'ENABLE_EXPORTS' style
-# module libraries (eg ibacmp).
-%define CMAKE_FLAGS -DCMAKE_MODULE_LINKER_FLAGS=""
-%else
-%if 0%{?fedora} >= 23
-# Ninja was introduced in FC23
-BuildRequires: ninja-build
-%define CMAKE_FLAGS -GNinja
-%define make_jobs ninja-build -v %{?_smp_mflags}
-%define cmake_install DESTDIR=%{buildroot} ninja-build install
-%else
-# Fallback to make otherwise
-BuildRequires: make
-%define make_jobs make -v %{?_smp_mflags}
-%define cmake_install DESTDIR=%{buildroot} make install
-%endif
-%endif
-
-# Detect if systemd is supported on this system
-%if 0%{?_unitdir:1}
-Requires(post): systemd-units
-Requires(preun): systemd-units
-Requires(postun): systemd-units
-%endif
-
-%description
-Temporary packaging
-
-This is a simple example without the split sub packages to get things started.
-
-%prep
-%setup
-
-%build
-
-# Detect if systemd is supported on this system
-%if 0%{?_unitdir:1}
-%define my_unitdir %{_unitdir}
-%else
-%define my_unitdir /tmp/
-%endif
-
-# New RPM defines _rundir, usually as /run
-%if 0%{?_rundir:1}
-%else
-%define _rundir /var/run
-%endif
-
-# New RPM defines _udevrulesdir, usually as /usr/lib/udev/rules.d
-%if 0%{?_udevrulesdir:1}
-%else
-# This is the old path (eg for C6)
-%define _udevrulesdir /lib/udev/rules.d
-%endif
-
-# Pass all of the rpm paths directly to GNUInstallDirs and our other defines.
-%cmake %{CMAKE_FLAGS} \
-         -DCMAKE_BUILD_TYPE=Release \
-         -DCMAKE_INSTALL_BINDIR:PATH=%{_bindir} \
-         -DCMAKE_INSTALL_SBINDIR:PATH=%{_sbindir} \
-         -DCMAKE_INSTALL_LIBDIR:PATH=%{_libdir} \
-         -DCMAKE_INSTALL_LIBEXECDIR:PATH=%{_libexecdir} \
-         -DCMAKE_INSTALL_LOCALSTATEDIR:PATH=%{_localstatedir} \
-         -DCMAKE_INSTALL_SHAREDSTATEDIR:PATH=%{_sharedstatedir} \
-         -DCMAKE_INSTALL_INCLUDEDIR:PATH=%{_includedir} \
-         -DCMAKE_INSTALL_INFODIR:PATH=%{_infodir} \
-         -DCMAKE_INSTALL_MANDIR:PATH=%{_mandir} \
-         -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \
-	 -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{my_unitdir} \
-	 -DCMAKE_INSTALL_INITDDIR:PATH=%{_initrddir} \
-	 -DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \
-	 -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \
-	 -DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir}
-%make_jobs
-
-%install
-%cmake_install
-
-%if 0%{?_unitdir:1}
-rm -rf %{buildroot}/%{_initrddir}/
-%else
-rm -rf %{buildroot}/%{my_unitdir}/
-%endif
-
-%post -p /sbin/ldconfig
-%postun -p /sbin/ldconfig
-
-%files
-%doc %{_mandir}/man*/*
-%{_bindir}/*
-%{_includedir}/*
-%{_libdir}/lib*.so*
-%{_libdir}/libibverbs/*
-%{_libdir}/ibacm/*
-%{_libdir}/rsocket/*
-%{_sbindir}/*
-%{_libexecdir}/*
-%{_udevrulesdir}/*
-%doc %{_docdir}/%{name}-%{version}/*
-%if 0%{?_unitdir:1}
-%{_unitdir}/*
-%else
-%config %{_initrddir}/*
-%endif
-%config %{_sysconfdir}/iwpmd.conf
-%config %{_sysconfdir}/srp_daemon.conf
-%config %{_sysconfdir}/libibverbs.d/*
-%config %{_sysconfdir}/rdma/modules/*
-%{_sysconfdir}/modprobe.d/*
-- 
2.14.1.252.gf15771ee3

--
To unsubscribe from this list: send the line "unsubscribe linux-rdma" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html