summaryrefslogtreecommitdiffstats
path: root/meta-oe
diff options
context:
space:
mode:
authorJackie Huang <jackie.huang@windriver.com>2014-04-21 01:46:02 -0400
committerMartin Jansa <Martin.Jansa@gmail.com>2014-05-03 20:45:00 +0200
commit8115e1205911521f3f407d261a2c3b6bf6d2511d (patch)
tree3dfdf59d97fb744453fed34e9549b25c247a4f57 /meta-oe
parent396cb0c354a63f4eb25ddd1755c274206c234705 (diff)
downloadmeta-openembedded-8115e1205911521f3f407d261a2c3b6bf6d2511d.tar.gz
iozone: update version to 414
Changes: - use BPN to fix multilib builds - drop the fileop-arm.patch since the issue is already fixed in the new version. Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Diffstat (limited to 'meta-oe')
-rw-r--r--meta-oe/recipes-benchmark/iozone3/iozone3/fileop-arm.patch32
-rw-r--r--meta-oe/recipes-benchmark/iozone3/iozone3_414.bb (renamed from meta-oe/recipes-benchmark/iozone3/iozone3_263.bb)51
2 files changed, 27 insertions, 56 deletions
diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3/fileop-arm.patch b/meta-oe/recipes-benchmark/iozone3/iozone3/fileop-arm.patch
deleted file mode 100644
index c71bfee9d..000000000
--- a/meta-oe/recipes-benchmark/iozone3/iozone3/fileop-arm.patch
+++ /dev/null
@@ -1,32 +0,0 @@
1Modify makefile to compile fileop.c file for ARM architecture.
2
3Upstream-Status: Inappropriate [not author]
4Index: current/makefile
5===================================================================
6--- current.orig/makefile 2006-10-14 21:42:36.000000000 +0200
7+++ current/makefile 2006-10-14 21:40:02.000000000 +0200
8@@ -190,9 +190,10 @@
9 #
10 # GNU 'C' compiler Linux build with threads, largefiles, async I/O
11 #
12-linux-arm: iozone_linux-arm.o libbif.o libasync.o
13+linux-arm: iozone_linux-arm.o libbif.o libasync.o fileop_linux-arm.o
14 $(CC) -O3 $(LDFLAGS) iozone_linux-arm.o libbif.o libasync.o \
15 -lrt -lpthread -o iozone
16+ $(CC) -O3 -Dlinux fileop_linux-arm.o -o fileop
17
18 #
19 # GNU 'C' compiler Linux build with threads, largefiles, async I/O
20@@ -725,6 +726,12 @@
21 @echo ""
22 $(CC) -Wall -c -O3 $(CFLAGS) fileop.c -o fileop_linux-AMD64.o
23
24+fileop_linux-arm.o: fileop.c
25+ @echo ""
26+ @echo "Building fileop for Linux-arm"
27+ @echo ""
28+ $(CC) -Wall -c -O3 $(CFLAGS) fileop.c -o fileop_linux-arm.o
29+
30 fileop_windows.o: fileop.c
31 @echo ""
32 @echo "Building fileop for Windows"
diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_263.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_414.bb
index 9de0ac774..14373b9e0 100644
--- a/meta-oe/recipes-benchmark/iozone3/iozone3_263.bb
+++ b/meta-oe/recipes-benchmark/iozone3/iozone3_414.bb
@@ -3,46 +3,49 @@ HOMEPAGE = "http://www.iozone.org/"
3AUTHOR = "Don Capps <don.capps2@verizon.net>, William D. Norcott <wnorcott@us.oracle.com>" 3AUTHOR = "Don Capps <don.capps2@verizon.net>, William D. Norcott <wnorcott@us.oracle.com>"
4SECTION = "console/tests" 4SECTION = "console/tests"
5LICENSE = "iozone3" 5LICENSE = "iozone3"
6LIC_FILES_CHKSUM = "file://iozone.c;beginline=237;endline=241;md5=ab42a6185fd0443978871f11a007ac0b" 6LIC_FILES_CHKSUM = "file://iozone.c;beginline=266;endline=270;md5=ab42a6185fd0443978871f11a007ac0b"
7 7
8 8SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \
9SRC_URI = "http://www.iozone.org/src/current/iozone3_263.tar \
10 file://copyright.txt \ 9 file://copyright.txt \
11 file://fileop-arm.patch \
12" 10"
13SRC_URI[md5sum] = "44fd88df361ec4508e10c8d6615245fa" 11SRC_URI[md5sum] = "a40dcda593f5841d0aaffe9f21172020"
14SRC_URI[sha256sum] = "920fde1a3843539570e2df4aa611e74df102e52d363c5973d5a9d15bdf976461" 12SRC_URI[sha256sum] = "9f60e854d7bc5bc3de15355cf5621e15098bd744a26845d11730b3060f4a5fff"
15 13
16S = "${WORKDIR}/${PN}_${PV}/src/current/" 14S = "${WORKDIR}/${BPN}_${PV}/src/current/"
17 15
18EXTRA_OEMAKE_powerpc = "linux-powerpc CC='${CC}'" 16#
19EXTRA_OEMAKE_powerpc64 = "linux-powerpc64 CC='${CC}'" 17# All other arches can use the default OEMAKE except those
20EXTRA_OEMAKE_arm = "linux-arm CC='${CC}'" 18# explicitly listed below. Another, the iozone3 Makefile
21EXTRA_OEMAKE = "linux CC='${CC}'" 19# needs to be told about the cross-compiler explicitly here.
20#
21EXTRA_OEMAKE_powerpc = "linux-powerpc CC='${CC}' GCC='${CC}'"
22EXTRA_OEMAKE_powerpc64 = "linux-powerpc64 CC='${CC}' GCC='${CC}'"
23EXTRA_OEMAKE_arm = "linux-arm CC='${CC}' GCC='${CC}'"
24EXTRA_OEMAKE = "linux CC='${CC}' GCC='${CC}'"
22 25
23TARGET_CC_ARCH += "${LDFLAGS}" 26TARGET_CC_ARCH += "${LDFLAGS}"
24 27
25do_install() { 28do_install() {
26 install -d ${D}${bindir} \ 29 install -d ${D}${bindir} \
27 ${D}${mandir}/man1 \ 30 ${D}${mandir}/man1 \
28 ${D}${datadir}/doc/${PN}/examples 31 ${D}${datadir}/doc/${BPN}/examples
29 32
30 install -m 0755 ${S}/iozone ${D}${bindir} 33 install -m 0755 ${S}/iozone ${D}${bindir}
31 install -m 0755 ${S}/fileop ${D}${bindir} 34 install -m 0755 ${S}/fileop ${D}${bindir}
32 install -m 0644 ${WORKDIR}/${PN}_${PV}/docs/iozone.1 ${D}${mandir}/man1/ 35 install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/iozone.1 ${D}${mandir}/man1/
33 install -m 0644 ${WORKDIR}/copyright.txt ${D}${datadir}/doc/${PN}/ 36 install -m 0644 ${WORKDIR}/copyright.txt ${D}${datadir}/doc/${BPN}/
34 37
35 install -m 0644 ${S}/*.dem ${D}${datadir}/doc/${PN}/examples 38 install -m 0644 ${S}/*.dem ${D}${datadir}/doc/${BPN}/examples
36 install -m 0644 ${S}/client_list ${D}${datadir}/doc/${PN}/examples 39 install -m 0644 ${S}/client_list ${D}${datadir}/doc/${BPN}/examples
37 install -m 0644 ${S}/Gnuplot.txt ${D}${datadir}/doc/${PN}/examples 40 install -m 0644 ${S}/Gnuplot.txt ${D}${datadir}/doc/${BPN}/examples
38 41
39 install -m 0755 ${S}/Generate_Graphs ${D}${datadir}/doc/${PN}/examples 42 install -m 0755 ${S}/Generate_Graphs ${D}${datadir}/doc/${BPN}/examples
40 install -m 0755 ${S}/gengnuplot.sh ${D}${datadir}/doc/${PN}/examples 43 install -m 0755 ${S}/gengnuplot.sh ${D}${datadir}/doc/${BPN}/examples
41 install -m 0755 ${S}/report.pl ${D}${datadir}/doc/${PN}/examples 44 install -m 0755 ${S}/report.pl ${D}${datadir}/doc/${BPN}/examples
42 45
43 install -m 0644 ${WORKDIR}/${PN}_${PV}/docs/Iozone_ps.gz ${D}${datadir}/doc/${PN}/ 46 install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Iozone_ps.gz ${D}${datadir}/doc/${BPN}/
44 install -m 0644 ${WORKDIR}/${PN}_${PV}/docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${PN}/ 47 install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${BPN}/
45 install -m 0644 ${WORKDIR}/${PN}_${PV}/docs/Run_rules.doc ${D}${datadir}/doc/${PN}/ 48 install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Run_rules.doc ${D}${datadir}/doc/${BPN}/
46} 49}
47 50
48FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt" 51FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt"