Skip to content

Commit becac34

Browse files
committed
client.fio: Update fio from 1.16.5 to 2.0.5
Since 1.16.5 version of fio can't be compiled on Fedora16 and RHEL6 boxes, update this fio package to 2.0.5. Signed-off-by: Qingtang Zhou <[email protected]>
1 parent e7f04dd commit becac34

File tree

5 files changed

+24
-24
lines changed

5 files changed

+24
-24
lines changed

fio/Makefile.patch

+9-18
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,11 @@
1-
--- src/Makefile2 2007-03-29 16:40:23.000000000 +0200
2-
+++ src/Makefile 2007-03-29 16:40:54.000000000 +0200
3-
@@ -2,7 +2,7 @@
4-
CC = gcc -W
5-
DEBUGFLAGS = -D_FORTIFY_SOURCE=2
6-
OPTFLAGS= -O2 -g $(EXTFLAGS)
7-
-CFLAGS = -Wwrite-strings -Wall -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(DEBUGFLAGS) -rdynamic
8-
+CFLAGS += -Wwrite-strings -Wall -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 $(OPTFLAGS) $(DEBUGFLAGS) -rdynamic
1+
--- src/Makefile2 2012-03-07 13:14:53.721251034 +0800
2+
+++ src/Makefile 2012-03-07 13:15:03.189987595 +0800
3+
@@ -3,7 +3,7 @@
4+
CPPFLAGS= -D_GNU_SOURCE -D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 \
5+
$(DEBUGFLAGS)
6+
OPTFLAGS= -O3 -fno-omit-frame-pointer -g $(EXTFLAGS)
7+
-CFLAGS = -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS)
8+
+CFLAGS += -std=gnu99 -Wwrite-strings -Wall $(OPTFLAGS)
9+
LIBS = -lm $(EXTLIBS)
910
PROGS = fio
1011
SCRIPTS = fio_generate_plots
11-
OBJS = gettime.o fio.o ioengines.o init.o stat.o log.o time.o md5.o crc32.o \
12-
@@ -28,7 +28,7 @@ bindir = $(prefix)/bin
13-
all: $(PROGS) $(SCRIPTS)
14-
15-
fio: $(OBJS)
16-
- $(CC) $(CFLAGS) -o $@ $(filter %.o,$^) $(EXTLIBS) -lpthread -lm -ldl -laio -lrt
17-
+ $(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(filter %.o,$^) $(EXTLIBS) -lpthread -lm -ldl -laio -lrt
18-
19-
clean:
20-
-rm -f *.o .depend cscope.out $(PROGS) engines/*.o core.* core

fio/control

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ TEST_TYPE = "client"
66
TIME = 'MEDIUM'
77
EXPERIMENTAL = "True"
88
DOC='''
9-
fio is an I/O tool meant to be used both for benchmark and stress/hardware
10-
verification. This test runs the fio tool. Details can be found at :
11-
http://freshmeat.net/projects/fio/
9+
fio is an I/O tool meant to be used both for benchmark and stress/hardware
10+
verification. This test runs the fio tool. Details can be found at :
11+
http://freecode.com/projects/fio
1212
'''
1313
job.run_test('fio')

fio/fio-1.16.5.tar.bz2

-975 KB
Binary file not shown.

fio/fio-2.0.5.tar.bz2

208 KB
Binary file not shown.

fio/fio.py

+12-3
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,23 @@
33

44

55
class fio(test.test):
6-
version = 2
6+
"""
7+
fio is an I/O tool mean for benchmark and stress/hardware verification.
8+
9+
@see: http://freecode.com/projects/fio
10+
"""
11+
version = 3
712

813
def initialize(self):
914
self.job.require_gcc()
1015

1116

12-
# http://brick.kernel.dk/snaps/fio-1.16.5.tar.bz2
13-
def setup(self, tarball = 'fio-1.16.5.tar.bz2'):
17+
def setup(self, tarball = 'fio-2.0.5.tar.bz2'):
18+
"""
19+
Compiles and installs fio.
20+
21+
@see: http://brick.kernel.dk/snaps/fio-2.0.5.tar.bz2
22+
"""
1423
tarball = utils.unmap_url(self.bindir, tarball, self.tmpdir)
1524
utils.extract_tarball_to_dir(tarball, self.srcdir)
1625

0 commit comments

Comments
 (0)