diff mbox

perftest: Fix rpm generation from dist tarball

Message ID 1437514480-22232-1-git-send-email-ira.weiny@intel.com (mailing list archive)
State Not Applicable
Headers show

Commit Message

Ira Weiny July 21, 2015, 9:34 p.m. UTC 
From: Ira Weiny <ira.weiny@intel.com>

The spec file within the git tree was not included in the dist tarball which
would prevent rpmbuild from building it.  Further errors are fixed by making
the spec file autogenerated and adding missing files to the tarball.

The following build sequence will now build an rpm from this repo.

	$ ./autogen.sh && ./configure && make dist
	$ rpmbuild -ta perftest-5.5.tar.gz

Signed-off-by: Ira Weiny <ira.weiny@intel.com>
---
 Makefile.am      |    2 +
 configure.ac     |    2 +-
 perftest.spec    |   61 ------------------------------------------------------
 perftest.spec.in |   61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
 4 files changed, 64 insertions(+), 62 deletions(-)
 delete mode 100644 perftest.spec
 create mode 100644 perftest.spec.in
diff mbox

Patch

diff --git a/Makefile.am b/Makefile.am
index 48a9bc3..7decfd7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -71,3 +71,5 @@  raw_ethernet_lat_LDADD =
 
 endif
 
+EXTRA_DIST = perftest.spec run_perftest_loopback runme
+
diff --git a/configure.ac b/configure.ac
index d4af0e6..c7955b1 100755
--- a/configure.ac
+++ b/configure.ac
@@ -156,5 +156,5 @@  fi
 CFLAGS="-g -Wall -D_GNU_SOURCE -O3"
 AC_SUBST([LIBUMAD])
 AC_SUBST([LIBMATH])
-AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([Makefile perftest.spec])
 AC_OUTPUT
diff --git a/perftest.spec b/perftest.spec
deleted file mode 100644
index e664221..0000000
--- a/perftest.spec
+++ /dev/null
@@ -1,61 +0,0 @@ 
-Name:           perftest
-Summary:        IB Performance tests
-Version:        3.0
-Release:        4.0
-License:        BSD 3-Clause, GPL v2 or later
-Group:          Productivity/Networking/Diagnostic
-Source:         http://www.openfabrics.org/downloads/%{name}-%{version}.tar.gz
-Url:            http://www.openfabrics.org
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-BuildRequires:  libibverbs-devel librdmacm-devel libibumad-devel
-
-%description
-gen3 uverbs microbenchmarks
-
-%prep
-%setup -q
-
-%build
-%configure
-%{__make}
-chmod -x runme
-
-%install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=%{buildroot} install
-
-%clean
-rm -rf ${RPM_BUILD_ROOT}
-
-%files
-%defattr(-, root, root)
-%doc README COPYING runme
-%_bindir/*
-
-%changelog
-* Wed Jan 09 2013 - idos@mellanox.com
-- Use autotools for building package.
-* Sun Dec 30 2012 - idos@mellanox.com
-- Added raw_ethernet_bw to install script.
-* Sat Oct 21 2012 - idos@mellanox.com
-- Removed write_bw_postlist (feature contained in all BW tests)
-* Sat Oct 20 2012 - idos@mellanox.com
-- Version 2.0 is underway
-* Sun May 14 2012 - idos@mellanox.com
-- Removed (deprecated) rdma_bw and rdma_lat tests
-* Sun Feb 02 2012 - idos@mellanox.com
-- Updated to 1.4.0 version (no compability with older version).
-* Sun Feb 02 2012 - idos@mellanox.com
-- Merge perftest code for Linux & Windows
-* Mon Jan 01 2012 - idos@mellanox.com
-- Added atomic benchmarks
-* Sat Apr 18 2009 - hal.rosenstock@gmail.com
-- Change executable names for rdma_lat and rdma_bw
-* Mon Jul 09 2007 - hvogel@suse.de
-- Use correct version
-* Wed Jul 04 2007 - hvogel@suse.de
-- Add GPL COPYING file [#289509]
-* Mon Jul 02 2007 - hvogel@suse.de
-- Update to the OFED 1.2 version
-* Fri Jun 22 2007 - hvogel@suse.de
-- Initial Package, Version 1.1
diff --git a/perftest.spec.in b/perftest.spec.in
new file mode 100644
index 0000000..33d2157
--- /dev/null
+++ b/perftest.spec.in
@@ -0,0 +1,61 @@ 
+Name:           perftest
+Summary:        IB Performance tests
+Version:        @VERSION@
+Release:        4.0
+License:        BSD 3-Clause, GPL v2 or later
+Group:          Productivity/Networking/Diagnostic
+Source:         http://www.openfabrics.org/downloads/%{name}-%{version}.tar.gz
+Url:            http://www.openfabrics.org
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+BuildRequires:  libibverbs-devel librdmacm-devel libibumad-devel
+
+%description
+gen3 uverbs microbenchmarks
+
+%prep
+%setup -q
+
+%build
+%configure
+%{__make}
+chmod -x runme
+
+%install
+rm -rf $RPM_BUILD_ROOT
+make DESTDIR=%{buildroot} install
+
+%clean
+rm -rf ${RPM_BUILD_ROOT}
+
+%files
+%defattr(-, root, root)
+%doc README COPYING runme
+%_bindir/*
+
+%changelog
+* Wed Jan 09 2013 - idos@mellanox.com
+- Use autotools for building package.
+* Sun Dec 30 2012 - idos@mellanox.com
+- Added raw_ethernet_bw to install script.
+* Sat Oct 21 2012 - idos@mellanox.com
+- Removed write_bw_postlist (feature contained in all BW tests)
+* Sat Oct 20 2012 - idos@mellanox.com
+- Version 2.0 is underway
+* Sun May 14 2012 - idos@mellanox.com
+- Removed (deprecated) rdma_bw and rdma_lat tests
+* Sun Feb 02 2012 - idos@mellanox.com
+- Updated to 1.4.0 version (no compability with older version).
+* Sun Feb 02 2012 - idos@mellanox.com
+- Merge perftest code for Linux & Windows
+* Mon Jan 01 2012 - idos@mellanox.com
+- Added atomic benchmarks
+* Sat Apr 18 2009 - hal.rosenstock@gmail.com
+- Change executable names for rdma_lat and rdma_bw
+* Mon Jul 09 2007 - hvogel@suse.de
+- Use correct version
+* Wed Jul 04 2007 - hvogel@suse.de
+- Add GPL COPYING file [#289509]
+* Mon Jul 02 2007 - hvogel@suse.de
+- Update to the OFED 1.2 version
+* Fri Jun 22 2007 - hvogel@suse.de
+- Initial Package, Version 1.1