From patchwork Tue Jul 21 21:34:40 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ira Weiny X-Patchwork-Id: 6838261 Return-Path: X-Original-To: patchwork-linux-rdma@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7B1F59F1D4 for ; Tue, 21 Jul 2015 21:34:50 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 69F16206C3 for ; Tue, 21 Jul 2015 21:34:49 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 432DE205DF for ; Tue, 21 Jul 2015 21:34:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754840AbbGUVeq (ORCPT ); Tue, 21 Jul 2015 17:34:46 -0400 Received: from mga14.intel.com ([192.55.52.115]:42211 "EHLO mga14.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752203AbbGUVep (ORCPT ); Tue, 21 Jul 2015 17:34:45 -0400 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga103.fm.intel.com with ESMTP; 21 Jul 2015 14:34:44 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.15,519,1432623600"; d="scan'208";a="768611989" Received: from phlsvsds.ph.intel.com ([10.228.195.38]) by orsmga002.jf.intel.com with ESMTP; 21 Jul 2015 14:34:43 -0700 Received: from phlsvsds.ph.intel.com (localhost.localdomain [127.0.0.1]) by phlsvsds.ph.intel.com (8.13.8/8.13.8) with ESMTP id t6LLYgXX022424; Tue, 21 Jul 2015 17:34:42 -0400 Received: (from iweiny@localhost) by phlsvsds.ph.intel.com (8.13.8/8.13.8/Submit) id t6LLYgTZ022421; Tue, 21 Jul 2015 17:34:42 -0400 X-Authentication-Warning: phlsvsds.ph.intel.com: iweiny set sender to ira.weiny@intel.com using -f From: ira.weiny@intel.com To: gilr@mellanox.com Cc: linux-rdma@vger.kernel.org, Ira Weiny Subject: [PATCH] perftest: Fix rpm generation from dist tarball Date: Tue, 21 Jul 2015 17:34:40 -0400 Message-Id: <1437514480-22232-1-git-send-email-ira.weiny@intel.com> X-Mailer: git-send-email 1.7.1 Sender: linux-rdma-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Ira Weiny 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 --- 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 --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