diff options
Diffstat (limited to 'meta-oe/recipes-benchmark/iozone3')
-rw-r--r-- | meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch | 35 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/iozone3/iozone3_506.bb (renamed from meta-oe/recipes-benchmark/iozone3/iozone3_489.bb) | 28 |
2 files changed, 34 insertions, 29 deletions
diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch b/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch index d5622ed2cf..48069ff141 100644 --- a/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch +++ b/meta-oe/recipes-benchmark/iozone3/iozone3/parallelism.patch @@ -10,20 +10,24 @@ Only fixed linux targets for now Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending +--- + current/makefile | 18 +++++++++--------- + 1 file changed, 9 insertions(+), 9 deletions(-) - ---- current/makefile.org 2016-12-06 02:19:10.367911020 +0000 -+++ current/makefile 2016-12-06 02:21:38.767911020 +0000 -@@ -167,7 +167,7 @@ +diff --git current/makefile current/makefile +index 3a54701..7071427 100644 +--- current/makefile ++++ current/makefile +@@ -171,7 +171,7 @@ hpux_no_ansi: iozone_hpux_no.o libbif.o # # GNU 'C' compiler Linux build with threads, largefiles, async I/O # -linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o +linux: iozone_linux.o fileop_linux.o pit_server.o - $(CC) -O3 $(LDFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \ + $(CC) -O3 $(CFLAGS) iozone_linux.o libasync.o libbif.o -lpthread \ -lrt -o iozone - $(CC) -O3 -Dlinux fileop_linux.o -o fileop -@@ -176,7 +176,7 @@ + $(CC) -O3 $(CFLAGS) -Dlinux fileop_linux.o -o fileop +@@ -180,7 +180,7 @@ linux: iozone_linux.o libasync.o libbif.o fileop_linux.o pit_server.o # # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O # @@ -32,7 +36,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-powerpc.o libasync.o \ libbif.o -lpthread -lrt -o iozone $(CC) -O3 -Dlinux fileop_linux-ppc.o -o fileop -@@ -184,7 +184,7 @@ +@@ -188,7 +188,7 @@ linux-powerpc: iozone_linux-powerpc.o libbif.o libasync.o fileop_linux-ppc.o pi # # GNU 'C' compiler Linux build for sparc chip with threads, largefiles, async I/O # @@ -41,7 +45,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-sparc.o libasync.o libbif.o \ -lpthread -lrt -o iozone $(CC) -O3 -Dlinux fileop_linux.o -o fileop -@@ -193,7 +193,7 @@ +@@ -197,7 +197,7 @@ linux-sparc: iozone_linux-sparc.o libbif.o libasync.o fileop_linux.o pit_server # # GNU 'C' compiler Linux build with threads, largefiles, async I/O # @@ -50,7 +54,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-ia64.o libbif.o libasync.o \ -lrt -lpthread -o iozone $(CC) -O3 -Dlinux fileop_linux-ia64.o -o fileop -@@ -202,7 +202,7 @@ +@@ -206,7 +206,7 @@ linux-ia64: iozone_linux-ia64.o libbif.o libasync.o fileop_linux-ia64.o pit_ser # # GNU 'C' compiler Linux build for powerpc chip with threads, largefiles, async I/O # @@ -59,7 +63,7 @@ Upstream-Status: Pending $(CC) -O3 -Dunix -DHAVE_ANSIC_C -DSHARED_MEM -DASYNC_IO \ -D_LARGEFILE64_SOURCE -Dlinux \ iozone_linux-powerpc64.o libasync.o libbif.o -lpthread \ -@@ -213,7 +213,7 @@ +@@ -217,7 +217,7 @@ linux-powerpc64: iozone_linux-powerpc64.o libbif.o libasync.o fileop_linux-ppc6 # # GNU 'C' compiler Linux build with threads, largefiles, async I/O # @@ -68,7 +72,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-arm.o libbif.o libasync.o \ -lrt -lpthread -o iozone $(CC) -O3 -Dlinux fileop_linux-arm.o -o fileop -@@ -222,7 +222,7 @@ +@@ -249,7 +249,7 @@ endif # # GNU 'C' compiler Linux build with threads, largefiles, async I/O # @@ -77,7 +81,7 @@ Upstream-Status: Pending $(CC) -O3 $(LDFLAGS) iozone_linux-AMD64.o libbif.o libasync.o \ -lrt -lpthread -o iozone $(CC) -O3 -Dlinux fileop_linux-AMD64.o -o fileop -@@ -231,7 +231,7 @@ +@@ -258,7 +258,7 @@ linux-AMD64: iozone_linux-AMD64.o libbif.o libasync.o fileop_linux-AMD64.o pit_ # # GNU 'C' compiler Linux build with S/390, threads, largfiles, async I/O # @@ -86,7 +90,7 @@ Upstream-Status: Pending $(CC) -O2 $(LDFLAGS) -lpthread -lrt iozone_linux-s390.o \ libbif.o libasync.o -o iozone $(CC) -O3 -Dlinux fileop_linux-s390.o -o fileop -@@ -240,7 +240,7 @@ +@@ -267,7 +267,7 @@ linux-S390: iozone_linux-s390.o libbif.o libasync.o fileop_linux-s390.o pit_serv # # GNU 'C' compiler Linux build with S/390, threads, largfiles, async I/O # @@ -95,3 +99,6 @@ Upstream-Status: Pending $(CC) -O2 $(LDFLAGS) -lpthread -lrt iozone_linux-s390x.o \ libbif.o libasync.o -o iozone $(CC) -O3 -Dlinux fileop_linux-s390x.o -o fileop +-- +2.25.1 + diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_489.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb index e4b7e4f490..6ab1121efb 100644 --- a/meta-oe/recipes-benchmark/iozone3/iozone3_489.bb +++ b/meta-oe/recipes-benchmark/iozone3/iozone3_506.bb @@ -1,6 +1,5 @@ SUMMARY = "Filesystem and Disk Benchmarking Tool" HOMEPAGE = "http://www.iozone.org/" -AUTHOR = "Don Capps <don.capps2@verizon.net>, William D. Norcott <wnorcott@us.oracle.com>" SECTION = "console/tests" LICENSE = "iozone3" LIC_FILES_CHKSUM = "file://iozone.c;beginline=37;endline=48;md5=7331260091868dcad0f9edea735b5f4b \ @@ -11,23 +10,22 @@ SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ file://0001-let-system-headers-provide-pread64.patch \ file://copyright.txt \ " -SRC_URI[md5sum] = "e863281987689cd6d9729e535637b77d" -SRC_URI[sha256sum] = "6155850d1019f2450dc926bbdb5a24abf423ee3bb928ab1e68569cf60a908584" +SRC_URI[sha256sum] = "114ce5c071873b9a2c7ba6e73d05d5ef7e66564392acbfcdc0b3261db10fcbe7" UPSTREAM_CHECK_REGEX = "iozone3_(?P<pver>\d+).tar" -S = "${WORKDIR}/${BPN}_${PV}/src/current/" +S = "${WORKDIR}/${BPN}_${PV}/src/current" # # All other arches can use the default OEMAKE except those # explicitly listed below. Another, the iozone3 Makefile # needs to be told about the cross-compiler explicitly here. # -EXTRA_OEMAKE_powerpc = "linux-powerpc CC='${CC}' GCC='${CC}'" -EXTRA_OEMAKE_powerpc64 = "linux-powerpc64 CC='${CC}' GCC='${CC}'" -EXTRA_OEMAKE_powerpc64le = "linux-powerpc64 CC='${CC}' GCC='${CC}'" -EXTRA_OEMAKE_x86-64 = "linux-AMD64 CC='${CC}' GCC='${CC}'" -EXTRA_OEMAKE_arm = "linux-arm CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE:powerpc = "linux-powerpc CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE:powerpc64 = "linux-powerpc64 CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE:powerpc64le = "linux-powerpc64 CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE:x86-64 = "linux-AMD64 CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE:arm = "linux-arm CC='${CC}' GCC='${CC}'" EXTRA_OEMAKE = "linux CC='${CC}' GCC='${CC}'" TARGET_CC_ARCH += "${LDFLAGS}" @@ -39,8 +37,8 @@ do_install() { install -m 0755 ${S}/iozone ${D}${bindir} install -m 0755 ${S}/fileop ${D}${bindir} - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/iozone.1 ${D}${mandir}/man1/ - install -m 0644 ${WORKDIR}/copyright.txt ${D}${datadir}/doc/${BPN}/ + install -m 0644 ${S}/../../docs/iozone.1 ${D}${mandir}/man1/ + install -m 0644 ${UNPACKDIR}/copyright.txt ${D}${datadir}/doc/${BPN}/ install -m 0644 ${S}/*.dem ${D}${datadir}/doc/${BPN}/examples install -m 0644 ${S}/client_list ${D}${datadir}/doc/${BPN}/examples @@ -50,12 +48,12 @@ do_install() { install -m 0755 ${S}/gengnuplot.sh ${D}${datadir}/doc/${BPN}/examples install -m 0755 ${S}/report.pl ${D}${datadir}/doc/${BPN}/examples - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Iozone_ps.gz ${D}${datadir}/doc/${BPN}/ - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${BPN}/ - install -m 0644 ${WORKDIR}/${BPN}_${PV}/docs/Run_rules.doc ${D}${datadir}/doc/${BPN}/ + install -m 0644 ${S}/../../docs/Iozone_ps.gz ${D}${datadir}/doc/${BPN}/ + install -m 0644 ${S}/../../docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${BPN}/ + install -m 0644 ${S}/../../docs/Run_rules.doc ${D}${datadir}/doc/${BPN}/ } -FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt" +FILES:${PN} += "${datadir}/doc/${PN}/copyright.txt" # LICENSE: # |