[PATCH rdma-core] redhat/spec: further cleanups to depdendencies, descriptions, formatting

[PATCH rdma-core] redhat/spec: further cleanups to depdendencies, descriptions, formatting

[Jarod Wilson]

These are numerous additional little fixups for the Fedora/Red Hat spec
file, stemming from Fedora package review.

- Per https://fedoraproject.org/wiki/Packaging:Systemd it seems we need to
  have systemd as a BuildRequires for %{_unitdir} to evaluate properly.

- Add explicit dependencies on kmod, initscripts and systemd, as there
  are container and vm cases where there might not be a kernel installed

- Add missing Requires to rdma-core-devel on each sub-package it provides
  devel headers and libs for

- Update summary of libibverbs to mention RoCE too

- Add requirement on logrotate to srp_daemon

- Make -DCMAKE_* spaces/tabs indentation consistent

- Make sure srp_daemon.sh is executable

- Fix librdmacm files list so librsocket.so.* is included as well

Signed-off-by: Jarod Wilson <jarod-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
 redhat/rdma-core.spec | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec
index 3bb16ed..360382c 100644
--- a/redhat/rdma-core.spec
+++ b/redhat/rdma-core.spec
@@ -19,8 +19,9 @@ BuildRequires: pkgconfig
 BuildRequires: pkgconfig(libnl-3.0)
 BuildRequires: pkgconfig(libnl-route-3.0)
 BuildRequires: valgrind-devel
+BuildRequires: systemd
 
-Requires: dracut
+Requires: dracut, kmod, initscripts, systemd
 # Red Hat/Fedora previously shipped redhat/ as a stand-alone
 # package called 'rdma', which we're supplanting here.
 Provides: rdma = %{version}-%{release}
@@ -48,14 +49,20 @@ dracut rules, and the rdma-ndd utility.
 
 %package devel
 Summary: RDMA core development libraries and headers
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: libibverbs = %{version}-%{release}
 Provides: libibverbs-devel = %{version}-%{release}
 Obsoletes: libibverbs-devel < %{version}-%{release}
+Requires: libibcm = %{version}-%{release}
 Provides: libibcm-devel = %{version}-%{release}
 Obsoletes: libibcm-devel < %{version}-%{release}
+Requires: libibumad = %{version}-%{release}
 Provides: libibumad-devel = %{version}-%{release}
 Obsoletes: libibumad-devel < %{version}-%{release}
+Requires: librdmacm = %{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}
 
@@ -63,7 +70,7 @@ Obsoletes: ibacm-devel < %{version}-%{release}
 RDMA core development libraries and headers.
 
 %package -n libibverbs
-Summary: A library and drivers for direct userspace use of RDMA (InfiniBand/iWARP) hardware
+Summary: A library and drivers for direct userspace use of RDMA (InfiniBand/iWARP/RoCE) hardware
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -188,6 +195,7 @@ Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: logrotate
 
 %description -n srp_daemon
 In conjunction with the kernel ib_srp driver, srp_daemon allows you to
@@ -217,11 +225,11 @@ discover and use SCSI devices via the SCSI RDMA Protocol over InfiniBand.
          -DCMAKE_INSTALL_INFODIR:PATH=%{_infodir} \
          -DCMAKE_INSTALL_MANDIR:PATH=%{_mandir} \
          -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \
-	 -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{_unitdir} \
-	 -DCMAKE_INSTALL_INITDDIR:PATH=%{_initrddir} \
-	 -DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \
-	 -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \
-	 -DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir}
+         -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{_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
@@ -263,6 +271,7 @@ install -D -m0644 redhat/ibacm.service %{buildroot}%{_unitdir}/
 
 # srp_daemon
 install -D -m0644 redhat/srp_daemon.service %{buildroot}%{_unitdir}/
+chmod a+x %{buildroot}%{_sbindir}/srp_daemon.sh
 
 # Delete the package's init.d scripts
 rm -rf %{buildroot}/%{_initrddir}/
@@ -389,7 +398,7 @@ rm -rf %{buildroot}/%{_initrddir}/
 %files -n librdmacm
 %{_libdir}/librdmacm*.so.*
 %dir %{_libdir}/rsocket
-%{_libdir}/rsocket/*.so
+%{_libdir}/rsocket/librsocket.so*
 %doc %{_docdir}/%{name}-%{version}/librdmacm.md
 %{_mandir}/man7/rsocket.*
 
-- 
2.10.0

--
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: [PATCH rdma-core] redhat/spec: further cleanups to depdendencies, descriptions, formatting

[Jason Gunthorpe]

On Thu, Dec 22, 2016 at 01:02:20PM -0500, Jarod Wilson wrote:
> These are numerous additional little fixups for the Fedora/Red Hat spec
> file, stemming from Fedora package review.
> 
> - Per https://fedoraproject.org/wiki/Packaging:Systemd it seems we need to
>   have systemd as a BuildRequires for %{_unitdir} to evaluate properly.
> 
> - Add explicit dependencies on kmod, initscripts and systemd, as there
>   are container and vm cases where there might not be a kernel
>   installed

Do we need initscripts?

> - Make sure srp_daemon.sh is executable

Oops, lets fix that commonly please, can you roll this in and drop the chmod:

diff --git a/srp_daemon/CMakeLists.txt b/srp_daemon/CMakeLists.txt
index f2752a8e6e1580..acb851bcb8a438 100644
--- a/srp_daemon/CMakeLists.txt
+++ b/srp_daemon/CMakeLists.txt
@@ -22,7 +22,8 @@ rdma_install_symlink(srp_daemon "${CMAKE_INSTALL_SBINDIR}/ibsrpdm")
 rdma_install_symlink(srp_daemon "${CMAKE_INSTALL_SBINDIR}/run_srp_daemon")
 rdma_subst_install(FILES "srp_daemon.sh.in"
   DESTINATION "${CMAKE_INSTALL_SBINDIR}"
-  RENAME "srp_daemon.sh")
+  RENAME "srp_daemon.sh"
+  PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
 
 install(FILES logrotate-srp_daemon DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/logrotate.d" RENAME "srp_daemon")
 install(FILES rsyslog-srp_daemon.conf DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/rsyslog.d" RENAME "srp_daemon.conf")

>  Requires: %{name}%{?_isa} = %{version}-%{release}
> +Requires: logrotate

I don't think we use logrotate for anything unless the srp rsyslog
examples are being used? Maybe it would be better to move the logrotate
and rsyslog stuff to doc/examples or something?

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

Re: [PATCH rdma-core] redhat/spec: further cleanups to depdendencies, descriptions, formatting

[Jarod Wilson]

On 2016-12-22 1:13 PM, Jason Gunthorpe wrote:
> On Thu, Dec 22, 2016 at 01:02:20PM -0500, Jarod Wilson wrote:
>> These are numerous additional little fixups for the Fedora/Red Hat spec
>> file, stemming from Fedora package review.
>>
>> - Per https://fedoraproject.org/wiki/Packaging:Systemd it seems we need to
>>   have systemd as a BuildRequires for %{_unitdir} to evaluate properly.
>>
>> - Add explicit dependencies on kmod, initscripts and systemd, as there
>>   are container and vm cases where there might not be a kernel
>>   installed
>
> Do we need initscripts?

Not really sure, the Fedora package reviewer insists we do.

>> - Make sure srp_daemon.sh is executable
>
> Oops, lets fix that commonly please, can you roll this in and drop the chmod:
>
> diff --git a/srp_daemon/CMakeLists.txt b/srp_daemon/CMakeLists.txt
> index f2752a8e6e1580..acb851bcb8a438 100644
> --- a/srp_daemon/CMakeLists.txt
> +++ b/srp_daemon/CMakeLists.txt
> @@ -22,7 +22,8 @@ rdma_install_symlink(srp_daemon "${CMAKE_INSTALL_SBINDIR}/ibsrpdm")
>  rdma_install_symlink(srp_daemon "${CMAKE_INSTALL_SBINDIR}/run_srp_daemon")
>  rdma_subst_install(FILES "srp_daemon.sh.in"
>    DESTINATION "${CMAKE_INSTALL_SBINDIR}"
> -  RENAME "srp_daemon.sh")
> +  RENAME "srp_daemon.sh"
> +  PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)

Ah, yeah, that's much better. Crap, hit send on v2 just as your mail 
came in. I guess I'll spin up a v3 momentarily.

>>  Requires: %{name}%{?_isa} = %{version}-%{release}
>> +Requires: logrotate
>
> I don't think we use logrotate for anything unless the srp rsyslog
> examples are being used? Maybe it would be better to move the logrotate
> and rsyslog stuff to doc/examples or something?

This is another one where the package reviewer seems insistent.

-- 
Jarod Wilson
jarod-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
--
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: [PATCH rdma-core] redhat/spec: further cleanups to depdendencies, descriptions, formatting

[Jason Gunthorpe]

On Thu, Dec 22, 2016 at 01:17:00PM -0500, Jarod Wilson wrote:

> >>- Add explicit dependencies on kmod, initscripts and systemd, as there
> >>  are container and vm cases where there might not be a kernel
> >>  installed
> >
> >Do we need initscripts?
> 
> Not really sure, the Fedora package reviewer insists we do.

Hm, no idea what for. We don't provide any LSB init scripts any more,
right?

> >> Requires: %{name}%{?_isa} = %{version}-%{release}
> >>+Requires: logrotate
> >
> >I don't think we use logrotate for anything unless the srp rsyslog
> >examples are being used? Maybe it would be better to move the logrotate
> >and rsyslog stuff to doc/examples or something?
> 
> This is another one where the package reviewer seems insistent.

By default "journald -u srp_daemon" does the same job, so I view
these files as obsolete for pre-systemd distros.

I think we should just not include the rsyslog and logrotate config
files at all. Sophisticated users that need that stuff can install
rsyslog and setup their own filtering. I assume that is the FC policy?
That avoids the reviewer comment.

It certainly makes 0 sense to Require logrotate without also requiring
rsyslog because rsyslog is the thing that writes the file being
rotated...

Forcing rsyslog is *really* not desirable, most people don't want/need
that overhead. Forcing logrotate is not desirable because it forces a
useless cron job to run and folks in this world are sensitive to that
jitter..

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

Re: [PATCH rdma-core] redhat/spec: further cleanups to depdendencies, descriptions, formatting

[Doug Ledford]

[-- Attachment #1.1: Type: text/plain, Size: 2029 bytes --]

On 12/22/2016 1:35 PM, Jason Gunthorpe wrote:
> On Thu, Dec 22, 2016 at 01:17:00PM -0500, Jarod Wilson wrote:
> 
>>>> - Add explicit dependencies on kmod, initscripts and systemd, as there
>>>>  are container and vm cases where there might not be a kernel
>>>>  installed
>>>
>>> Do we need initscripts?
>>
>> Not really sure, the Fedora package reviewer insists we do.
> 
> Hm, no idea what for. We don't provide any LSB init scripts any more,
> right?

I think this is a distro specific thing.  Last I knew, there might still
be one or two things that haven't been migrated from initscripts to
systemd, or maybe they want the functions that the initscripts package
provides?

>>>> Requires: %{name}%{?_isa} = %{version}-%{release}
>>>> +Requires: logrotate
>>>
>>> I don't think we use logrotate for anything unless the srp rsyslog
>>> examples are being used? Maybe it would be better to move the logrotate
>>> and rsyslog stuff to doc/examples or something?
>>
>> This is another one where the package reviewer seems insistent.
> 
> By default "journald -u srp_daemon" does the same job, so I view
> these files as obsolete for pre-systemd distros.
> 
> I think we should just not include the rsyslog and logrotate config
> files at all. Sophisticated users that need that stuff can install
> rsyslog and setup their own filtering. I assume that is the FC policy?
> That avoids the reviewer comment.
> 
> It certainly makes 0 sense to Require logrotate without also requiring
> rsyslog because rsyslog is the thing that writes the file being
> rotated...
> 
> Forcing rsyslog is *really* not desirable, most people don't want/need
> that overhead. Forcing logrotate is not desirable because it forces a
> useless cron job to run and folks in this world are sensitive to that
> jitter..

Agreed.


-- 
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
    GPG Key ID: B826A3330E572FDD
    Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]

Re: [PATCH rdma-core] redhat/spec: further cleanups to depdendencies, descriptions, formatting

[Jason Gunthorpe]

On Thu, Dec 22, 2016 at 01:41:59PM -0500, Doug Ledford wrote:
> On 12/22/2016 1:35 PM, Jason Gunthorpe wrote:
> > On Thu, Dec 22, 2016 at 01:17:00PM -0500, Jarod Wilson wrote:
> > 
> >>>> - Add explicit dependencies on kmod, initscripts and systemd, as there
> >>>>  are container and vm cases where there might not be a kernel
> >>>>  installed
> >>>
> >>> Do we need initscripts?
> >>
> >> Not really sure, the Fedora package reviewer insists we do.
> > 
> > Hm, no idea what for. We don't provide any LSB init scripts any more,
> > right?
> 
> I think this is a distro specific thing.  Last I knew, there might still
> be one or two things that haven't been migrated from initscripts to
> systemd, or maybe they want the functions that the initscripts package
> provides?

No idea, but it is a big dependency (12 pacakges, 5M)

If the reviewer wants it, lets have them propose a comment about what
it is needed for since none of us seem to know :)

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

Re: [PATCH rdma-core] redhat/spec: further cleanups to depdendencies, descriptions, formatting

[Doug Ledford]

[-- Attachment #1.1: Type: text/plain, Size: 1240 bytes --]

On 12/22/2016 2:00 PM, Jason Gunthorpe wrote:
> On Thu, Dec 22, 2016 at 01:41:59PM -0500, Doug Ledford wrote:
>> On 12/22/2016 1:35 PM, Jason Gunthorpe wrote:
>>> On Thu, Dec 22, 2016 at 01:17:00PM -0500, Jarod Wilson wrote:
>>>
>>>>>> - Add explicit dependencies on kmod, initscripts and systemd, as there
>>>>>>  are container and vm cases where there might not be a kernel
>>>>>>  installed
>>>>>
>>>>> Do we need initscripts?
>>>>
>>>> Not really sure, the Fedora package reviewer insists we do.
>>>
>>> Hm, no idea what for. We don't provide any LSB init scripts any more,
>>> right?
>>
>> I think this is a distro specific thing.  Last I knew, there might still
>> be one or two things that haven't been migrated from initscripts to
>> systemd, or maybe they want the functions that the initscripts package
>> provides?
> 
> No idea, but it is a big dependency (12 pacakges, 5M)
> 
> If the reviewer wants it, lets have them propose a comment about what
> it is needed for since none of us seem to know :)

Fair enough ;-)


-- 
Doug Ledford <dledford-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
    GPG Key ID: B826A3330E572FDD
    Key fingerprint = AE6B 1BDA 122B 23B4 265B  1274 B826 A333 0E57 2FDD


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 884 bytes --]

Re: [PATCH rdma-core] redhat/spec: further cleanups to depdendencies, descriptions, formatting

[Jarod Wilson]

On 2016-12-22 1:02 PM, Jarod Wilson wrote:
> These are numerous additional little fixups for the Fedora/Red Hat spec
> file, stemming from Fedora package review.
>
> - Per https://fedoraproject.org/wiki/Packaging:Systemd it seems we need to
>   have systemd as a BuildRequires for %{_unitdir} to evaluate properly.
>
> - Add explicit dependencies on kmod, initscripts and systemd, as there
>   are container and vm cases where there might not be a kernel installed
>
> - Add missing Requires to rdma-core-devel on each sub-package it provides
>   devel headers and libs for
>
> - Update summary of libibverbs to mention RoCE too
>
> - Add requirement on logrotate to srp_daemon
>
> - Make -DCMAKE_* spaces/tabs indentation consistent
>
> - Make sure srp_daemon.sh is executable
>
> - Fix librdmacm files list so librsocket.so.* is included as well
>
> Signed-off-by: Jarod Wilson <jarod-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
...
> @@ -263,6 +271,7 @@ install -D -m0644 redhat/ibacm.service %{buildroot}%{_unitdir}/
>
>  # srp_daemon
>  install -D -m0644 redhat/srp_daemon.service %{buildroot}%{_unitdir}/
> +chmod a+x %{buildroot}%{_sbindir}/srp_daemon.sh
>
>  # Delete the package's init.d scripts
>  rm -rf %{buildroot}/%{_initrddir}/
> @@ -389,7 +398,7 @@ rm -rf %{buildroot}/%{_initrddir}/
>  %files -n librdmacm
>  %{_libdir}/librdmacm*.so.*
>  %dir %{_libdir}/rsocket
> -%{_libdir}/rsocket/*.so
> +%{_libdir}/rsocket/librsocket.so*
>  %doc %{_docdir}/%{name}-%{version}/librdmacm.md
>  %{_mandir}/man7/rsocket.*

This is what I get for trying to rush things out the door right before 
holiday shutdown. That's librspreload, not librsocket. v2 coming in a sec.

-- 
Jarod Wilson
jarod-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
--
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

[PATCH rdma-core v2] redhat/spec: further cleanups to depdendencies, descriptions, formatting

[Jarod Wilson]

These are numerous additional little fixups for the Fedora/Red Hat spec
file, stemming from Fedora package review.

- Per https://fedoraproject.org/wiki/Packaging:Systemd it seems we need to
  have systemd as a BuildRequires for %{_unitdir} to evaluate properly.

- Add explicit dependencies on kmod, initscripts and systemd, as there
  are container and vm cases where there might not be a kernel installed

- Add missing Requires to rdma-core-devel on each sub-package it provides
  devel headers and libs for

- Update summary of libibverbs to mention RoCE too

- Add requirement on logrotate to srp_daemon

- Make -DCMAKE_* spaces/tabs indentation consistent

- Make sure srp_daemon.sh is executable

- Fix librdmacm files list so librspreload.so.* is included as well

Signed-off-by: Jarod Wilson <jarod-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
v2: librspreload, not librsocket

 redhat/rdma-core.spec | 25 +++++++++++++++++--------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec
index 3bb16ed..360382c 100644
--- a/redhat/rdma-core.spec
+++ b/redhat/rdma-core.spec
@@ -19,8 +19,9 @@ BuildRequires: pkgconfig
 BuildRequires: pkgconfig(libnl-3.0)
 BuildRequires: pkgconfig(libnl-route-3.0)
 BuildRequires: valgrind-devel
+BuildRequires: systemd
 
-Requires: dracut
+Requires: dracut, kmod, initscripts, systemd
 # Red Hat/Fedora previously shipped redhat/ as a stand-alone
 # package called 'rdma', which we're supplanting here.
 Provides: rdma = %{version}-%{release}
@@ -48,14 +49,20 @@ dracut rules, and the rdma-ndd utility.
 
 %package devel
 Summary: RDMA core development libraries and headers
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: libibverbs = %{version}-%{release}
 Provides: libibverbs-devel = %{version}-%{release}
 Obsoletes: libibverbs-devel < %{version}-%{release}
+Requires: libibcm = %{version}-%{release}
 Provides: libibcm-devel = %{version}-%{release}
 Obsoletes: libibcm-devel < %{version}-%{release}
+Requires: libibumad = %{version}-%{release}
 Provides: libibumad-devel = %{version}-%{release}
 Obsoletes: libibumad-devel < %{version}-%{release}
+Requires: librdmacm = %{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}
 
@@ -63,7 +70,7 @@ Obsoletes: ibacm-devel < %{version}-%{release}
 RDMA core development libraries and headers.
 
 %package -n libibverbs
-Summary: A library and drivers for direct userspace use of RDMA (InfiniBand/iWARP) hardware
+Summary: A library and drivers for direct userspace use of RDMA (InfiniBand/iWARP/RoCE) hardware
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -188,6 +195,7 @@ Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: logrotate
 
 %description -n srp_daemon
 In conjunction with the kernel ib_srp driver, srp_daemon allows you to
@@ -217,11 +225,11 @@ discover and use SCSI devices via the SCSI RDMA Protocol over InfiniBand.
          -DCMAKE_INSTALL_INFODIR:PATH=%{_infodir} \
          -DCMAKE_INSTALL_MANDIR:PATH=%{_mandir} \
          -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \
-	 -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{_unitdir} \
-	 -DCMAKE_INSTALL_INITDDIR:PATH=%{_initrddir} \
-	 -DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \
-	 -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \
-	 -DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir}
+         -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{_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
@@ -263,6 +271,7 @@ install -D -m0644 redhat/ibacm.service %{buildroot}%{_unitdir}/
 
 # srp_daemon
 install -D -m0644 redhat/srp_daemon.service %{buildroot}%{_unitdir}/
+chmod a+x %{buildroot}%{_sbindir}/srp_daemon.sh
 
 # Delete the package's init.d scripts
 rm -rf %{buildroot}/%{_initrddir}/
@@ -389,7 +398,7 @@ rm -rf %{buildroot}/%{_initrddir}/
 %files -n librdmacm
 %{_libdir}/librdmacm*.so.*
 %dir %{_libdir}/rsocket
-%{_libdir}/rsocket/*.so
+%{_libdir}/rsocket/librspreload.so*
 %doc %{_docdir}/%{name}-%{version}/librdmacm.md
 %{_mandir}/man7/rsocket.*
 
-- 
2.10.0

--
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

[PATCH rdma-core v3] redhat/spec: further cleanups to depdendencies, descriptions, formatting

[Jarod Wilson]

These are numerous additional little fixups for the Fedora/Red Hat spec
file, stemming from Fedora package review.

- Per https://fedoraproject.org/wiki/Packaging:Systemd it seems we need to
  have systemd as a BuildRequires for %{_unitdir} to evaluate properly.

- Add explicit dependencies on kmod, and systemd, because in the world of
  containers and some virt guests, these aren't automatically pulled in,
  due to not having a kernel installed in the container or guest.

- Add missing Requires to rdma-core-devel on each sub-package it provides
  devel headers and libs for

- Update summary of libibverbs to mention RoCE too

- Add requirement on logrotate to srp_daemon

- Make -DCMAKE_* spaces/tabs indentation consistent

- Add conflicts for old infiniband-diags carrying ndd

Signed-off-by: Jarod Wilson <jarod-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>
---
v3: rebase to current git head, drop requirement on initscripts,
add conflicts for old infiniband-diags

 redhat/rdma-core.spec | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec
index 8efbabf..246079e 100644
--- a/redhat/rdma-core.spec
+++ b/redhat/rdma-core.spec
@@ -19,12 +19,14 @@ BuildRequires: pkgconfig
 BuildRequires: pkgconfig(libnl-3.0)
 BuildRequires: pkgconfig(libnl-route-3.0)
 BuildRequires: valgrind-devel
+BuildRequires: systemd
 
-Requires: dracut
+Requires: dracut, kmod, systemd
 # Red Hat/Fedora previously shipped redhat/ as a stand-alone
 # package called 'rdma', which we're supplanting here.
 Provides: rdma = %{version}-%{release}
 Obsoletes: rdma < %{version}-%{release}
+Conflicts: infiniband-diags <= 1.6.7
 
 # Since we recommend developers use Ninja, so should packagers, for consistency.
 %define CMAKE_FLAGS %{nil}
@@ -42,20 +44,26 @@ BuildRequires: make
 %endif
 
 %description
-RDMA core userspace infrastructure and documentation, including initscripts,
-kernel driver-specific modprobe override configs, IPoIB network scripts,
-dracut rules, and the rdma-ndd utility.
+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
+Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: libibverbs = %{version}-%{release}
 Provides: libibverbs-devel = %{version}-%{release}
 Obsoletes: libibverbs-devel < %{version}-%{release}
+Requires: libibcm = %{version}-%{release}
 Provides: libibcm-devel = %{version}-%{release}
 Obsoletes: libibcm-devel < %{version}-%{release}
+Requires: libibumad = %{version}-%{release}
 Provides: libibumad-devel = %{version}-%{release}
 Obsoletes: libibumad-devel < %{version}-%{release}
+Requires: librdmacm = %{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}
 
@@ -63,7 +71,7 @@ Obsoletes: ibacm-devel < %{version}-%{release}
 RDMA core development libraries and headers.
 
 %package -n libibverbs
-Summary: A library and drivers for direct userspace use of RDMA (InfiniBand/iWARP) hardware
+Summary: A library and drivers for direct userspace use of RDMA (InfiniBand/iWARP/RoCE) hardware
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires: %{name}%{?_isa} = %{version}-%{release}
@@ -188,6 +196,7 @@ Requires(post): systemd-units
 Requires(preun): systemd-units
 Requires(postun): systemd-units
 Requires: %{name}%{?_isa} = %{version}-%{release}
+Requires: logrotate
 
 %description -n srp_daemon
 In conjunction with the kernel ib_srp driver, srp_daemon allows you to
@@ -217,11 +226,11 @@ discover and use SCSI devices via the SCSI RDMA Protocol over InfiniBand.
          -DCMAKE_INSTALL_INFODIR:PATH=%{_infodir} \
          -DCMAKE_INSTALL_MANDIR:PATH=%{_mandir} \
          -DCMAKE_INSTALL_SYSCONFDIR:PATH=%{_sysconfdir} \
-	 -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{_unitdir} \
-	 -DCMAKE_INSTALL_INITDDIR:PATH=%{_initrddir} \
-	 -DCMAKE_INSTALL_RUNDIR:PATH=%{_rundir} \
-	 -DCMAKE_INSTALL_DOCDIR:PATH=%{_docdir}/%{name}-%{version} \
-	 -DCMAKE_INSTALL_UDEV_RULESDIR:PATH=%{_udevrulesdir}
+         -DCMAKE_INSTALL_SYSTEMD_SERVICEDIR:PATH=%{_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
-- 
2.10.0

--
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: [PATCH rdma-core v3] redhat/spec: further cleanups to depdendencies, descriptions, formatting

[Jason Gunthorpe]

On Mon, Jan 09, 2017 at 04:39:10PM -0500, Jarod Wilson wrote:
> These are numerous additional little fixups for the Fedora/Red Hat spec
> file, stemming from Fedora package review.
> 
> - Per https://fedoraproject.org/wiki/Packaging:Systemd it seems we need to
>   have systemd as a BuildRequires for %{_unitdir} to evaluate properly.
> 
> - Add explicit dependencies on kmod, and systemd, because in the world of
>   containers and some virt guests, these aren't automatically pulled in,
>   due to not having a kernel installed in the container or guest.
> 
> - Add missing Requires to rdma-core-devel on each sub-package it provides
>   devel headers and libs for
> 
> - Update summary of libibverbs to mention RoCE too
> 
> - Add requirement on logrotate to srp_daemon

I thought we agreed to just dump the rsyslog stuff?

>From 304bbeadf79efe01e8db8230e21d812e1fec152f Mon Sep 17 00:00:00 2001
From: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
Date: Mon, 9 Jan 2017 15:34:44 -0700
Subject: [PATCH] srp: Do no include example log rsyslog configuration

Distros are now using systemd so 'journalctl -u srp_daemon' does
the same thing.

Signed-off-by: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
---
 srp_daemon/CMakeLists.txt          | 2 --
 srp_daemon/logrotate-srp_daemon    | 7 -------
 srp_daemon/rsyslog-srp_daemon.conf | 3 ---
 3 files changed, 12 deletions(-)
 delete mode 100644 srp_daemon/logrotate-srp_daemon
 delete mode 100644 srp_daemon/rsyslog-srp_daemon.conf

diff --git a/srp_daemon/CMakeLists.txt b/srp_daemon/CMakeLists.txt
index acb851bcb8a438..305682d740085b 100644
--- a/srp_daemon/CMakeLists.txt
+++ b/srp_daemon/CMakeLists.txt
@@ -25,8 +25,6 @@ rdma_subst_install(FILES "srp_daemon.sh.in"
   RENAME "srp_daemon.sh"
   PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE)
 
-install(FILES logrotate-srp_daemon DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/logrotate.d" RENAME "srp_daemon")
-install(FILES rsyslog-srp_daemon.conf DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}/rsyslog.d" RENAME "srp_daemon.conf")
 install(FILES srp_daemon.conf DESTINATION "${CMAKE_INSTALL_SYSCONFDIR}")
 
 if ("${DISTRO_FLAVOUR}" STREQUAL "Debian")
diff --git a/srp_daemon/logrotate-srp_daemon b/srp_daemon/logrotate-srp_daemon
deleted file mode 100644
index 066b6325ed27ff..00000000000000
--- a/srp_daemon/logrotate-srp_daemon
+++ /dev/null
@@ -1,7 +0,0 @@
-/var/log/srp_daemon {
-	missingok
-	notifempty
-	copytruncate
-	weekly
-	compress
-}
diff --git a/srp_daemon/rsyslog-srp_daemon.conf b/srp_daemon/rsyslog-srp_daemon.conf
deleted file mode 100644
index 191ca799b1c371..00000000000000
--- a/srp_daemon/rsyslog-srp_daemon.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-if	$programname == 'srp_daemon' or $syslogtag == '[srp_daemon]:' \
-then	-/var/log/srp_daemon.log
-&	~
-- 
2.7.4

--
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: [PATCH rdma-core v3] redhat/spec: further cleanups to depdendencies, descriptions, formatting

[Jarod Wilson]

On 2017-01-09 5:36 PM, Jason Gunthorpe wrote:
> On Mon, Jan 09, 2017 at 04:39:10PM -0500, Jarod Wilson wrote:
>> These are numerous additional little fixups for the Fedora/Red Hat spec
>> file, stemming from Fedora package review.
>>
>> - Per https://fedoraproject.org/wiki/Packaging:Systemd it seems we need to
>>   have systemd as a BuildRequires for %{_unitdir} to evaluate properly.
>>
>> - Add explicit dependencies on kmod, and systemd, because in the world of
>>   containers and some virt guests, these aren't automatically pulled in,
>>   due to not having a kernel installed in the container or guest.
>>
>> - Add missing Requires to rdma-core-devel on each sub-package it provides
>>   devel headers and libs for
>>
>> - Update summary of libibverbs to mention RoCE too
>>
>> - Add requirement on logrotate to srp_daemon
>
> I thought we agreed to just dump the rsyslog stuff?
>
> From 304bbeadf79efe01e8db8230e21d812e1fec152f Mon Sep 17 00:00:00 2001
> From: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>
> Date: Mon, 9 Jan 2017 15:34:44 -0700
> Subject: [PATCH] srp: Do no include example log rsyslog configuration
>
> Distros are now using systemd so 'journalctl -u srp_daemon' does
> the same thing.
>
> Signed-off-by: Jason Gunthorpe <jgunthorpe-ePGOBjL8dl3ta4EC/59zMFaTQe2KTcn/@public.gmane.org>

Ah, yes. Whoops. I blame vacation, I forgot about that when trying to 
get back up to speed on this today. :)

-- 
Jarod Wilson
jarod-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org
--
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