From f7126cd96b9e1f3d4bae4e1b4dfa1cefa6c6952ac850e608d39799b287667e93 Mon Sep 17 00:00:00 2001 From: OBS User unknown Date: Mon, 13 Oct 2008 14:16:55 +0000 Subject: [PATCH] OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/bonnie?expand=0&rev=4 --- bonnie-1.4.dif | 54 ++++++++++++++++++++++++++++---------------- bonnie.changes | 5 +++++ bonnie.spec | 57 +++++++++++++++++++++++++++++++++++++++++------ ctcstools.tar.bz2 | 3 +++ 4 files changed, 93 insertions(+), 26 deletions(-) create mode 100644 ctcstools.tar.bz2 diff --git a/bonnie-1.4.dif b/bonnie-1.4.dif index 38932c0..3ebfbd3 100644 --- a/bonnie-1.4.dif +++ b/bonnie-1.4.dif @@ -1,6 +1,17 @@ ---- Bonnie.c -+++ Bonnie.c -@@ -170,6 +170,13 @@ +diff -Naur /tmp/bonnie/bonnie/Bonnie.c bonnie/Bonnie.c +--- /tmp/bonnie/bonnie/Bonnie.c 2002-04-04 14:59:46.000000000 +0200 ++++ bonnie/Bonnie.c 2008-09-23 15:08:22.000000000 +0200 +@@ -79,7 +79,8 @@ + + #ifdef __linux__ + /* for o_direct */ +-#include ++//#include ++#include + #endif + + #ifdef unix +@@ -170,6 +171,13 @@ #define o_direct 0 #endif @@ -14,8 +25,27 @@ int main( int argc, char * argv[]) ---- Makefile -+++ Makefile +@@ -263,7 +271,7 @@ + memsz *= sysconf (_SC_PAGESIZE); + if (1024*1024*size <= memsz) + { +- fprintf (stderr, "Bonnie: Warning: You have %iMB RAM, but you test with only %iMB datasize!\n", ++ fprintf (stderr, "Bonnie: Warning: You have %iMB RAM, but you test with only %liMB datasize!\n", + memsz/(1024*1024), size); + fprintf (stderr, "Bonnie: This might yield unrealistically good results,\n"); + fprintf (stderr, "Bonnie: for reading and seeking%s.\n", +@@ -622,7 +630,7 @@ + } + + #define FLTBUFS 8 +-char fltidx = 0; ++int fltidx = 0; + char fltbuf[8][FLTBUFS]; + char * cpupc (const int idx) + { +diff -Naur /tmp/bonnie/bonnie/Makefile bonnie/Makefile +--- /tmp/bonnie/bonnie/Makefile 2002-02-20 19:22:55.000000000 +0100 ++++ bonnie/Makefile 2008-09-23 15:08:53.000000000 +0200 @@ -23,9 +23,9 @@ # Added 99/07/20, install: Bonnie @@ -28,17 +58,3 @@ gzip -9f $(DESTDIR)$(MANDIR)/man1/bonnie.1 clean: ---- Bonnie.c 2002-04-04 12:59:46.000000000 +0000 -+++ Bonnie.c 2008-04-26 05:17:35.000000000 +0000 -@@ -77,11 +77,6 @@ - #include - #include - --#ifdef __linux__ --/* for o_direct */ --#include --#endif -- - #ifdef unix - #include - #endif diff --git a/bonnie.changes b/bonnie.changes index 362275a..4dda317 100644 --- a/bonnie.changes +++ b/bonnie.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 26 18:31:00 CEST 2008 - vmarsik@suse.cz + +- added subpackage for CTCS2 integration + ------------------------------------------------------------------- Sat Apr 26 07:18:49 CEST 2008 - coolo@suse.de diff --git a/bonnie.spec b/bonnie.spec index 61f4cfc..4ab92b4 100644 --- a/bonnie.spec +++ b/bonnie.spec @@ -2,9 +2,16 @@ # spec file for package bonnie (Version 1.4) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -18,11 +25,14 @@ Group: System/Benchmark AutoReqProv: on Summary: File System Benchmark Version: 1.4 -Release: 443 -Source: %{name}-%{version}.tar.bz2 -Patch: bonnie-1.4.dif +Release: 474 +Source0: %{name}-%{version}.tar.bz2 +Source1: ctcstools.tar.bz2 +Patch0: bonnie-1.4.dif #Patch: %{name}-%{version}.diff BuildRoot: %{_tmppath}/%{name}-%{version}-build +#BuildRequires: linux-kernel-headers - fails on SLES-10-SP2 +BuildRequires: kernel-source %description Bonnie is a popular performance benchmark that targets various aspects @@ -30,20 +40,46 @@ of Unix file systems. +Authors: +-------- + Tim Bray + Kurt Garloff + +%package ctcs2-glue +License: GPL v2 or later +Summary: File System Benchmark +Group: System/Benchmark +Requires: bonnie ctcs2 >= 0.1.1 +#BuildArchitectures: noarch + +%description ctcs2-glue +Bonnie is a popular performance benchmark that targets various aspects +of Unix file systems. + + + Authors: -------- Tim Bray Kurt Garloff %prep -%setup -n bonnie -%patch +%setup -n bonnie -a1 +%patch0 -p1 %build make CC=gcc CFLAGS="$RPM_OPT_FLAGS" %install make install DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} +cd ctcstools +mkdir -p $RPM_BUILD_ROOT/usr/share/qa/bonnie/tcf +mkdir -p $RPM_BUILD_ROOT/usr/share/qa/tcf +mkdir -p $RPM_BUILD_ROOT/usr/lib/ctcs2/tools +install -m 744 do_bonnie $RPM_BUILD_ROOT/usr/share/qa/bonnie/ +install -m 644 *.tcf $RPM_BUILD_ROOT/usr/share/qa/bonnie/tcf/ +for A in *.tcf; do ln -s ../../../../usr/share/qa/bonnie/tcf/$A $RPM_BUILD_ROOT/usr/share/qa/tcf/; done +install -m 744 bonnie-run $RPM_BUILD_ROOT/usr/lib/ctcs2/tools/ %files %defattr(-, root, root) @@ -51,7 +87,14 @@ make install DESTDIR=$RPM_BUILD_ROOT MANDIR=%{_mandir} /usr/bin/bonnie %{_mandir}/man1/bonnie.1.gz +%files ctcs2-glue +%defattr(-, root, root) +/usr/share/qa +/usr/lib/ctcs2 + %changelog +* Fri Sep 26 2008 vmarsik@suse.cz +- added subpackage for CTCS2 integration * Sat Apr 26 2008 coolo@suse.de - remove unused header file * Mon May 22 2006 schwab@suse.de diff --git a/ctcstools.tar.bz2 b/ctcstools.tar.bz2 new file mode 100644 index 0000000..1994127 --- /dev/null +++ b/ctcstools.tar.bz2 @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:c45a8366b0c93420a617b85de5a57d8273a19ef9a041d6c279ac13d96daa8faf +size 920