| Message ID | 20161221220840.36268-6-jarod@redhat.com (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
On 2016-12-21 5:08 PM, Jarod Wilson wrote: > Nothing owned libdir/rsocket, and librdmacm was laying down dangling > symlinks to librspreload.so, so just put it all in librdmacm. > > Signed-off-by: Jarod Wilson <jarod@redhat.com> > --- > redhat/rdma-core.spec | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec > index 1f51720..96a67a4 100644 > --- a/redhat/rdma-core.spec > +++ b/redhat/rdma-core.spec > @@ -336,13 +336,11 @@ rm -rf %{buildroot}/%{_initrddir}/ > %doc %{_docdir}/%{name}-%{version}/MAINTAINERS > %{_includedir}/* > %{_libdir}/lib*.so > -%{_libdir}/rsocket/*.so > %{_mandir}/man3/ibv_* > %{_mandir}/man3/rdma* > %{_mandir}/man3/umad* > %{_mandir}/man3/*_to_ibv_rate.* > %{_mandir}/man7/rdma_cm.* > -%{_mandir}/man7/rsocket.* > > %files -n libibverbs > %dir %{_sysconfdir}/libibverbs.d > @@ -389,8 +387,10 @@ rm -rf %{buildroot}/%{_initrddir}/ > > %files -n librdmacm > %{_libdir}/librdmacm*.so.* > -%{_libdir}/rsocket/*.so.* > +%dir %{_libdir}/rsocket > +%{_libdir}/rsocket/*.so Minor error here, should be rsocket/*.so* to pick up the symlinks too, at least until they get neutered. > %doc %{_docdir}/%{name}-%{version}/librdmacm.md > +%{_mandir}/man7/rsocket.* > > %files -n librdmacm-utils > %{_bindir}/cmtime >
On Thu, Dec 22, 2016 at 02:17:52AM -0500, Jarod Wilson wrote: > > %files -n librdmacm > > %{_libdir}/librdmacm*.so.* > >-%{_libdir}/rsocket/*.so.* > >+%dir %{_libdir}/rsocket > >+%{_libdir}/rsocket/*.so > > Minor error here, should be rsocket/*.so* to pick up the symlinks too, at > least until they get neutered. FWIW, it would also be appropriate to put the LDPRELOAD library into librdmacm-utils.. Jason -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 12/22/2016 12:33 PM, Jason Gunthorpe wrote: > On Thu, Dec 22, 2016 at 02:17:52AM -0500, Jarod Wilson wrote: >>> %files -n librdmacm >>> %{_libdir}/librdmacm*.so.* >>> -%{_libdir}/rsocket/*.so.* >>> +%dir %{_libdir}/rsocket >>> +%{_libdir}/rsocket/*.so >> >> Minor error here, should be rsocket/*.so* to pick up the symlinks too, at >> least until they get neutered. I hand fixed this when taking the original series BTW... > FWIW, it would also be appropriate to put the LDPRELOAD library into > librdmacm-utils.. I'm pretty sure the Fedora standards would want it in librsocket and not in a -utils package. The -utils package should be executables and not libraries.
On Thu, Dec 22, 2016 at 01:15:55PM -0500, Doug Ledford wrote: > On 12/22/2016 12:33 PM, Jason Gunthorpe wrote: > > On Thu, Dec 22, 2016 at 02:17:52AM -0500, Jarod Wilson wrote: > >>> %files -n librdmacm > >>> %{_libdir}/librdmacm*.so.* > >>> -%{_libdir}/rsocket/*.so.* > >>> +%dir %{_libdir}/rsocket > >>> +%{_libdir}/rsocket/*.so > >> > >> Minor error here, should be rsocket/*.so* to pick up the symlinks too, at > >> least until they get neutered. > > I hand fixed this when taking the original series BTW... > > > FWIW, it would also be appropriate to put the LDPRELOAD library into > > librdmacm-utils.. > > I'm pretty sure the Fedora standards would want it in librsocket and not > in a -utils package. The -utils package should be executables and not > libraries. Not sure, don't see anything about preload libraries. This is not a link library, it is only executable via LD_PRELOAD, and it shouldn't result in any automatic RPM Provides either (ditto for all our plugins, I didn't check this). Ideally there would be a 'run under rsockets' helper tool that did the preload (ala fakeroot), and then it would be clear that the library is a private data file of the helper and not a system link library. Jason -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 2016-12-22 1:15 PM, Doug Ledford wrote: > On 12/22/2016 12:33 PM, Jason Gunthorpe wrote: >> On Thu, Dec 22, 2016 at 02:17:52AM -0500, Jarod Wilson wrote: >>>> %files -n librdmacm >>>> %{_libdir}/librdmacm*.so.* >>>> -%{_libdir}/rsocket/*.so.* >>>> +%dir %{_libdir}/rsocket >>>> +%{_libdir}/rsocket/*.so >>> >>> Minor error here, should be rsocket/*.so* to pick up the symlinks too, at >>> least until they get neutered. > > I hand fixed this when taking the original series BTW... Okay, this fixup was in my follow-up patch as well. Guessing what to patch against a little, since it's not pushed yet. ;) >> FWIW, it would also be appropriate to put the LDPRELOAD library into >> librdmacm-utils.. > > I'm pretty sure the Fedora standards would want it in librsocket and not > in a -utils package. The -utils package should be executables and not > libraries. Yeah, I think it's probably best where it is now. Do you want a re-respin of the follow-up patch to drop the chmod bit and duplicitous librspreload fixup, or can you just smash it all together?
On 12/22/2016 1:23 PM, Jarod Wilson wrote: > On 2016-12-22 1:15 PM, Doug Ledford wrote: >> On 12/22/2016 12:33 PM, Jason Gunthorpe wrote: >>> On Thu, Dec 22, 2016 at 02:17:52AM -0500, Jarod Wilson wrote: >>>>> %files -n librdmacm >>>>> %{_libdir}/librdmacm*.so.* >>>>> -%{_libdir}/rsocket/*.so.* >>>>> +%dir %{_libdir}/rsocket >>>>> +%{_libdir}/rsocket/*.so >>>> >>>> Minor error here, should be rsocket/*.so* to pick up the symlinks >>>> too, at >>>> least until they get neutered. >> >> I hand fixed this when taking the original series BTW... > > Okay, this fixup was in my follow-up patch as well. Guessing what to > patch against a little, since it's not pushed yet. ;) So, that was my mistake. I pushed using --tags and that sent the tag, but not the master ref update. I just pushed out my current master. I thought adding --tags to the push command would add tags to the push, not replace the normal push with only a tag push. My mistake.
diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec index 1f51720..96a67a4 100644 --- a/redhat/rdma-core.spec +++ b/redhat/rdma-core.spec @@ -336,13 +336,11 @@ rm -rf %{buildroot}/%{_initrddir}/ %doc %{_docdir}/%{name}-%{version}/MAINTAINERS %{_includedir}/* %{_libdir}/lib*.so -%{_libdir}/rsocket/*.so %{_mandir}/man3/ibv_* %{_mandir}/man3/rdma* %{_mandir}/man3/umad* %{_mandir}/man3/*_to_ibv_rate.* %{_mandir}/man7/rdma_cm.* -%{_mandir}/man7/rsocket.* %files -n libibverbs %dir %{_sysconfdir}/libibverbs.d @@ -389,8 +387,10 @@ rm -rf %{buildroot}/%{_initrddir}/ %files -n librdmacm %{_libdir}/librdmacm*.so.* -%{_libdir}/rsocket/*.so.* +%dir %{_libdir}/rsocket +%{_libdir}/rsocket/*.so %doc %{_docdir}/%{name}-%{version}/librdmacm.md +%{_mandir}/man7/rsocket.* %files -n librdmacm-utils %{_bindir}/cmtime
Nothing owned libdir/rsocket, and librdmacm was laying down dangling symlinks to librspreload.so, so just put it all in librdmacm. Signed-off-by: Jarod Wilson <jarod@redhat.com> --- redhat/rdma-core.spec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)