All of lore.kernel.org
 help / color / mirror / Atom feed
* [PATCH] infiniband-diags: Fix RPM build error
@ 2012-07-11 14:06 Hal Rosenstock
       [not found] ` <4FFD8858.3030205-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
  0 siblings, 1 reply; 3+ messages in thread
From: Hal Rosenstock @ 2012-07-11 14:06 UTC (permalink / raw)
  To: Ira Weiny; +Cc: linux-rdma (linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org)


RPM build errors:
Installed (but unpackaged) file(s) found:
/etc/infiniband-diags

Signed-off-by: Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
---
diff --git a/Makefile.am b/Makefile.am
index 33b5f90..2265110 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -147,5 +147,5 @@ install-data-hook:
 		$(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/infiniband-diags; \
 	fi
 	$(top_srcdir)/config/install-sh -c -m 444 $(top_srcdir)/scripts/IBswcountlimits.pm $(DESTDIR)/$(PERL_INSTALLDIR)/IBswcountlimits.pm
-	$(top_srcdir)/config/install-sh -c -m 444 $(top_srcdir)/etc/error_thresholds $(DESTDIR)/$(sysconfdir)/infiniband-diags
-	$(top_srcdir)/config/install-sh -c -m 400 $(top_srcdir)/etc/ibdiag.conf $(DESTDIR)/$(sysconfdir)/infiniband-diags
+	$(top_srcdir)/config/install-sh -c -m 444 $(top_srcdir)/etc/error_thresholds $(DESTDIR)/$(sysconfdir)/infiniband-diags/error_thresholds
+	$(top_srcdir)/config/install-sh -c -m 400 $(top_srcdir)/etc/ibdiag.conf $(DESTDIR)/$(sysconfdir)/infiniband-diags/ibdiag.conf
diff --git a/infiniband-diags.spec.in b/infiniband-diags.spec.in
index d3fcd13..86db3fd 100644
--- a/infiniband-diags.spec.in
+++ b/infiniband-diags.spec.in
@@ -158,6 +158,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_mandir}/man8/infiniband-diags.8.gz
 %{_libdir}/*.a
 %{_libdir}/*.so*
+%{_sysconfdir}/*
 %{_mandir}/man3/*
 %{_includedir}/infiniband/*.h
 %define _perldir %(perl -e 'use Config; $T=$Config{installvendorlib}; print $T;')
--
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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] infiniband-diags: Fix RPM build error
       [not found] ` <4FFD8858.3030205-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
@ 2012-07-11 17:02   ` Ira Weiny
       [not found]     ` <20120711100211.8101143ea8473ba81a80654c-i2BcT+NCU+M@public.gmane.org>
  0 siblings, 1 reply; 3+ messages in thread
From: Ira Weiny @ 2012-07-11 17:02 UTC (permalink / raw)
  To: Hal Rosenstock
  Cc: linux-rdma (linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org)

On Wed, 11 Jul 2012 10:06:16 -0400
Hal Rosenstock <hal-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org> wrote:

> 
> RPM build errors:
> Installed (but unpackaged) file(s) found:
> /etc/infiniband-diags
> 
> Signed-off-by: Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
> ---
> diff --git a/Makefile.am b/Makefile.am
> index 33b5f90..2265110 100644
> --- a/Makefile.am
> +++ b/Makefile.am
> @@ -147,5 +147,5 @@ install-data-hook:
>  		$(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/infiniband-diags; \
>  	fi
>  	$(top_srcdir)/config/install-sh -c -m 444 $(top_srcdir)/scripts/IBswcountlimits.pm $(DESTDIR)/$(PERL_INSTALLDIR)/IBswcountlimits.pm
> -	$(top_srcdir)/config/install-sh -c -m 444 $(top_srcdir)/etc/error_thresholds $(DESTDIR)/$(sysconfdir)/infiniband-diags
> -	$(top_srcdir)/config/install-sh -c -m 400 $(top_srcdir)/etc/ibdiag.conf $(DESTDIR)/$(sysconfdir)/infiniband-diags
> +	$(top_srcdir)/config/install-sh -c -m 444 $(top_srcdir)/etc/error_thresholds $(DESTDIR)/$(sysconfdir)/infiniband-diags/error_thresholds
> +	$(top_srcdir)/config/install-sh -c -m 400 $(top_srcdir)/etc/ibdiag.conf $(DESTDIR)/$(sysconfdir)/infiniband-diags/ibdiag.conf

What platform is this on?  I think it is fine to be more specific but this has worked for me on Fedora and RHEL.

09:55:55 > rpm -qpil /home/weiny2/rpmbuild/RPMS/x86_64/infiniband-diags-1.6.0-unknown.ch5.x86_64.rpm | grep error_thres
/etc/infiniband-diags/error_thresholds

09:56:00 > rpm -qpil /home/weiny2/rpmbuild/RPMS/x86_64/infiniband-diags-1.6.0-unknown.ch5.x86_64.rpm | grep ibdiag
/etc/infiniband-diags/ibdiag.conf


> diff --git a/infiniband-diags.spec.in b/infiniband-diags.spec.in
> index d3fcd13..86db3fd 100644
> --- a/infiniband-diags.spec.in
> +++ b/infiniband-diags.spec.in
> @@ -158,6 +158,7 @@ rm -rf $RPM_BUILD_ROOT
>  %{_mandir}/man8/infiniband-diags.8.gz
>  %{_libdir}/*.a
>  %{_libdir}/*.so*
> +%{_sysconfdir}/*
>  %{_mandir}/man3/*
>  %{_includedir}/infiniband/*.h
>  %define _perldir %(perl -e 'use Config; $T=$Config{installvendorlib}; print $T;')

The Master branch already includes %{_sysconfdir}/*

%define _perldir %(perl -e 'use Config; $T=$Config{installvendorlib}; print $T;')
%{_perldir}/*
%{_sysconfdir}/*          <<==============  Does this not work???
%doc README COPYING ChangeLog


Ira


-- 
Ira Weiny
Member of Technical Staff
Lawrence Livermore National Lab
925-423-8008
weiny2-i2BcT+NCU+M@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

^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] infiniband-diags: Fix RPM build error
       [not found]     ` <20120711100211.8101143ea8473ba81a80654c-i2BcT+NCU+M@public.gmane.org>
@ 2012-07-12 10:19       ` Hal Rosenstock
  0 siblings, 0 replies; 3+ messages in thread
From: Hal Rosenstock @ 2012-07-12 10:19 UTC (permalink / raw)
  To: Ira Weiny; +Cc: linux-rdma (linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org)

On 7/11/2012 1:02 PM, Ira Weiny wrote:
> On Wed, 11 Jul 2012 10:06:16 -0400
> Hal Rosenstock <hal-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org> wrote:
> 
>>
>> RPM build errors:
>> Installed (but unpackaged) file(s) found:
>> /etc/infiniband-diags
>>
>> Signed-off-by: Hal Rosenstock <hal-VPRAkNaXOzVWk0Htik3J/w@public.gmane.org>
>> ---
>> diff --git a/Makefile.am b/Makefile.am
>> index 33b5f90..2265110 100644
>> --- a/Makefile.am
>> +++ b/Makefile.am
>> @@ -147,5 +147,5 @@ install-data-hook:
>>  		$(top_srcdir)/config/install-sh -m 755 -d $(DESTDIR)/$(sysconfdir)/infiniband-diags; \
>>  	fi
>>  	$(top_srcdir)/config/install-sh -c -m 444 $(top_srcdir)/scripts/IBswcountlimits.pm $(DESTDIR)/$(PERL_INSTALLDIR)/IBswcountlimits.pm
>> -	$(top_srcdir)/config/install-sh -c -m 444 $(top_srcdir)/etc/error_thresholds $(DESTDIR)/$(sysconfdir)/infiniband-diags
>> -	$(top_srcdir)/config/install-sh -c -m 400 $(top_srcdir)/etc/ibdiag.conf $(DESTDIR)/$(sysconfdir)/infiniband-diags
>> +	$(top_srcdir)/config/install-sh -c -m 444 $(top_srcdir)/etc/error_thresholds $(DESTDIR)/$(sysconfdir)/infiniband-diags/error_thresholds
>> +	$(top_srcdir)/config/install-sh -c -m 400 $(top_srcdir)/etc/ibdiag.conf $(DESTDIR)/$(sysconfdir)/infiniband-diags/ibdiag.conf
> 
> What platform is this on?  

The platform is ESXi 4.1.0

> I think it is fine to be more specific but this has worked for me on Fedora and RHEL.

/etc/infiniband-diags ended up being the actual ibdiag.conf file (rather
than having /etc/infiniband-diags/ibdiag.conf) so I thought the same
thing would occur with error_thresholds.

> 09:55:55 > rpm -qpil /home/weiny2/rpmbuild/RPMS/x86_64/infiniband-diags-1.6.0-unknown.ch5.x86_64.rpm | grep error_thres
> /etc/infiniband-diags/error_thresholds
> 
> 09:56:00 > rpm -qpil /home/weiny2/rpmbuild/RPMS/x86_64/infiniband-diags-1.6.0-unknown.ch5.x86_64.rpm | grep ibdiag
> /etc/infiniband-diags/ibdiag.conf
> 
> 
>> diff --git a/infiniband-diags.spec.in b/infiniband-diags.spec.in
>> index d3fcd13..86db3fd 100644
>> --- a/infiniband-diags.spec.in
>> +++ b/infiniband-diags.spec.in
>> @@ -158,6 +158,7 @@ rm -rf $RPM_BUILD_ROOT
>>  %{_mandir}/man8/infiniband-diags.8.gz
>>  %{_libdir}/*.a
>>  %{_libdir}/*.so*
>> +%{_sysconfdir}/*
>>  %{_mandir}/man3/*
>>  %{_includedir}/infiniband/*.h
>>  %define _perldir %(perl -e 'use Config; $T=$Config{installvendorlib}; print $T;')
> 
> The Master branch already includes %{_sysconfdir}/*
> 
> %define _perldir %(perl -e 'use Config; $T=$Config{installvendorlib}; print $T;')
> %{_perldir}/*
> %{_sysconfdir}/*          <<==============  Does this not work???

Missed that.

-- Hal

> %doc README COPYING ChangeLog
> 
> 
> Ira
> 
> 

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

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-07-12 10:19 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2012-07-11 14:06 [PATCH] infiniband-diags: Fix RPM build error Hal Rosenstock
     [not found] ` <4FFD8858.3030205-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org>
2012-07-11 17:02   ` Ira Weiny
     [not found]     ` <20120711100211.8101143ea8473ba81a80654c-i2BcT+NCU+M@public.gmane.org>
2012-07-12 10:19       ` Hal Rosenstock

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.