[PATCH rdma_core] redhat spec: Avoid conflict due to implicit directory add

[PATCH rdma_core] redhat spec: Avoid conflict due to implicit directory add

[Knut Omang]

If *-notation is used to include subdirectories, they
seem to end as explicit file additions. This causes conflicts
with other packages that provides the same
directories, in this case rdma_core-devel conflicts
with filesystem and kernel-headers.

Using %dir did not seem to help
avoiding the issue but rather cause duplicate warnings, eg.

warning: File listed twice: /usr/include/infiniband

This should be considered a bug in rpmbuild but
probably needs to be fixed here anyway:

List each individual directory with wildcards
to avoid the issue.

Signed-off-by: Knut Omang <knut.omang-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
---
 redhat/rdma-core.spec | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec
index 4271e7c..72d6f3b 100644
--- a/redhat/rdma-core.spec
+++ b/redhat/rdma-core.spec
@@ -343,7 +343,8 @@ rm -rf %{buildroot}/%{_initrddir}/
 
 %files devel
 %doc %{_docdir}/%{name}-%{version}/MAINTAINERS
-%{_includedir}/*
+%{_includedir}/infiniband/*
+%{_includedir}/rdma/*
 %{_libdir}/lib*.so
 %{_mandir}/man3/ibv_*
 %{_mandir}/man3/rdma*

base-commit: b1c9b6aa22fb91507fb1a63df99566da7720315f
-- 
git-series 0.8.10
--
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: Avoid conflict due to implicit directory add

[Jason Gunthorpe]

On Wed, Jan 11, 2017 at 03:19:34PM +0100, Knut Omang wrote:
> If *-notation is used to include subdirectories, they
> seem to end as explicit file additions. This causes conflicts
> with other packages that provides the same
> directories, in this case rdma_core-devel conflicts
> with filesystem and kernel-headers.
> 
> Using %dir did not seem to help
> avoiding the issue but rather cause duplicate warnings, eg.
> 
> warning: File listed twice: /usr/include/infiniband
> 
> This should be considered a bug in rpmbuild but
> probably needs to be fixed here anyway:
> 
> List each individual directory with wildcards
> to avoid the issue.
> 
> Signed-off-by: Knut Omang <knut.omang-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
>  redhat/rdma-core.spec | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)

Did this ever get settled?

Jarod? Yes/No?

> diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec
> index 4271e7c..72d6f3b 100644
> +++ b/redhat/rdma-core.spec
> @@ -343,7 +343,8 @@ rm -rf %{buildroot}/%{_initrddir}/
>  
>  %files devel
>  %doc %{_docdir}/%{name}-%{version}/MAINTAINERS
> -%{_includedir}/*
> +%{_includedir}/infiniband/*
> +%{_includedir}/rdma/*
>  %{_libdir}/lib*.so
>  %{_mandir}/man3/ibv_*
>  %{_mandir}/man3/rdma*
> 
> base-commit: b1c9b6aa22fb91507fb1a63df99566da7720315f
--
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: Avoid conflict due to implicit directory add

[Jarod Wilson]

On 2017-03-13 1:08 PM, Jason Gunthorpe wrote:
> On Wed, Jan 11, 2017 at 03:19:34PM +0100, Knut Omang wrote:
>> If *-notation is used to include subdirectories, they
>> seem to end as explicit file additions. This causes conflicts
>> with other packages that provides the same
>> directories, in this case rdma_core-devel conflicts
>> with filesystem and kernel-headers.
>>
>> Using %dir did not seem to help
>> avoiding the issue but rather cause duplicate warnings, eg.
>>
>> warning: File listed twice: /usr/include/infiniband
>>
>> This should be considered a bug in rpmbuild but
>> probably needs to be fixed here anyway:
>>
>> List each individual directory with wildcards
>> to avoid the issue.
>>
>> Signed-off-by: Knut Omang <knut.omang-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
>>  redhat/rdma-core.spec | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> Did this ever get settled?
>
> Jarod? Yes/No?

Sorry, missed this. I don't remember ever hitting this myself, but the 
change looks benign enough, so sure, why not.


-- 
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: Avoid conflict due to implicit directory add

[Knut Omang]

On Mon, 2017-03-13 at 15:23 -0400, Jarod Wilson wrote:
> On 2017-03-13 1:08 PM, Jason Gunthorpe wrote:
> > 
> > On Wed, Jan 11, 2017 at 03:19:34PM +0100, Knut Omang wrote:
> > > 
> > > If *-notation is used to include subdirectories, they
> > > seem to end as explicit file additions. This causes conflicts
> > > with other packages that provides the same
> > > directories, in this case rdma_core-devel conflicts
> > > with filesystem and kernel-headers.
> > > 
> > > Using %dir did not seem to help
> > > avoiding the issue but rather cause duplicate warnings, eg.
> > > 
> > > warning: File listed twice: /usr/include/infiniband
> > > 
> > > This should be considered a bug in rpmbuild but
> > > probably needs to be fixed here anyway:
> > > 
> > > List each individual directory with wildcards
> > > to avoid the issue.
> > > 
> > > Signed-off-by: Knut Omang <knut.omang-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> > >  redhat/rdma-core.spec | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > Did this ever get settled?
> > 
> > Jarod? Yes/No?
> 
> Sorry, missed this. I don't remember ever hitting this myself, but the 
> change looks benign enough, so sure, why not.

Yes, and now I think I finally understand why you have not hit it:
It seems to work as expected with a lot of different ways of invoking
rpmbuild, but for some subtle reason, not the way I have been using in a script
for years, and I still don't understand why. 

This is probably again more of an rpmbuild issue but still it might be something
that others have run into as well.

Instead of doing like eg. fedpkg is doing: providing a lot of elaborous (and
quite ugly IMHO)  --define '_sourcedir ...' --define '_specdir ...' ..  on the
command line to rpmbuild, I wanted to be able to just have a macro file
prepended at the end of the macro path - the file can then have a nice, clean
content like:

%_sourcedir ...
%_specdir ...
...

However there is no way I have figured to specify an additional element to the
macros path - the only way is to use --macros which overloads the complete path.
So my script initially run rpmbuild .. --showrc and picks up the default macro
path and prepends it with the extra element, a solution not perfect, but that
gave me some satisfaction over having beaten rpmbuild back when I wrote the code
:-)

For some obscure reason this now produces different behaviour. 
Any light on this appreciated - this has caused me a lot of grief...

Thanks,
Knut

> 
> 
--
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: Avoid conflict due to implicit directory add

[Jarod Wilson]

On 2017-03-13 1:08 PM, Jason Gunthorpe wrote:
> On Wed, Jan 11, 2017 at 03:19:34PM +0100, Knut Omang wrote:
>> If *-notation is used to include subdirectories, they
>> seem to end as explicit file additions. This causes conflicts
>> with other packages that provides the same
>> directories, in this case rdma_core-devel conflicts
>> with filesystem and kernel-headers.
>>
>> Using %dir did not seem to help
>> avoiding the issue but rather cause duplicate warnings, eg.
>>
>> warning: File listed twice: /usr/include/infiniband
>>
>> This should be considered a bug in rpmbuild but
>> probably needs to be fixed here anyway:
>>
>> List each individual directory with wildcards
>> to avoid the issue.
>>
>> Signed-off-by: Knut Omang <knut.omang-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
>>  redhat/rdma-core.spec | 3 ++-
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> Did this ever get settled?
>
> Jarod? Yes/No?

Actually, looking a little closer, I think this is more apropos:

diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec
index f3c1c296..383cb965 100644
--- a/redhat/rdma-core.spec
+++ b/redhat/rdma-core.spec
@@ -347,7 +347,10 @@ rm -rf %{buildroot}/%{_initrddir}/

  %files devel
  %doc %{_docdir}/%{name}-%{version}/MAINTAINERS
-%{_includedir}/*
+%dir %{_includedir}/infiniband
+%dir %{_includedir}/rdma
+%{_includedir}/infiniband/*
+%{_includedir}/rdma/*
  %{_libdir}/lib*.so
  %{_mandir}/man3/ibv_*
  %{_mandir}/man3/rdma*


-- 
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: Avoid conflict due to implicit directory add

[Doug Ledford]

On Mon, 2017-03-13 at 16:11 -0400, Jarod Wilson wrote:
> On 2017-03-13 1:08 PM, Jason Gunthorpe wrote:
> > 
> > On Wed, Jan 11, 2017 at 03:19:34PM +0100, Knut Omang wrote:
> > > 
> > > If *-notation is used to include subdirectories, they
> > > seem to end as explicit file additions. This causes conflicts
> > > with other packages that provides the same
> > > directories, in this case rdma_core-devel conflicts
> > > with filesystem and kernel-headers.
> > > 
> > > Using %dir did not seem to help
> > > avoiding the issue but rather cause duplicate warnings, eg.
> > > 
> > > warning: File listed twice: /usr/include/infiniband
> > > 
> > > This should be considered a bug in rpmbuild but
> > > probably needs to be fixed here anyway:
> > > 
> > > List each individual directory with wildcards
> > > to avoid the issue.
> > > 
> > > Signed-off-by: Knut Omang <knut.omang-QHcLZuEGTsvQT0dZR+AlfA@public.gmane.org>
> > >  redhat/rdma-core.spec | 3 ++-
> > >  1 file changed, 2 insertions(+), 1 deletion(-)
> > 
> > Did this ever get settled?
> > 
> > Jarod? Yes/No?
> 
> Actually, looking a little closer, I think this is more apropos:
> 
> diff --git a/redhat/rdma-core.spec b/redhat/rdma-core.spec
> index f3c1c296..383cb965 100644
> --- a/redhat/rdma-core.spec
> +++ b/redhat/rdma-core.spec
> @@ -347,7 +347,10 @@ rm -rf %{buildroot}/%{_initrddir}/
> 
>   %files devel
>   %doc %{_docdir}/%{name}-%{version}/MAINTAINERS
> -%{_includedir}/*
> +%dir %{_includedir}/infiniband
> +%dir %{_includedir}/rdma
> +%{_includedir}/infiniband/*
> +%{_includedir}/rdma/*
>   %{_libdir}/lib*.so
>   %{_mandir}/man3/ibv_*
>   %{_mandir}/man3/rdma*

Thanks, applied.

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

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