From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ira Weiny Subject: Re: [PATCH] infiniband-diags: Fix RPM build error Date: Wed, 11 Jul 2012 10:02:11 -0700 Message-ID: <20120711100211.8101143ea8473ba81a80654c@llnl.gov> References: <4FFD8858.3030205@dev.mellanox.co.il> Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <4FFD8858.3030205-LDSdmyG8hGV8YrgS2mwiifqBs+8SCbDb@public.gmane.org> Sender: linux-rdma-owner-u79uwXL29TY76Z2rM5mHXA@public.gmane.org To: Hal Rosenstock Cc: "linux-rdma (linux-rdma-u79uwXL29TY76Z2rM5mHXA@public.gmane.org)" List-Id: linux-rdma@vger.kernel.org On Wed, 11 Jul 2012 10:06:16 -0400 Hal Rosenstock wrote: > > RPM build errors: > Installed (but unpackaged) file(s) found: > /etc/infiniband-diags > > Signed-off-by: Hal Rosenstock > --- > 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