From 8115e1205911521f3f407d261a2c3b6bf6d2511d Mon Sep 17 00:00:00 2001 From: Jackie Huang Date: Mon, 21 Apr 2014 01:46:02 -0400 Subject: 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 --- .../iozone3/iozone3/fileop-arm.patch | 32 ------ meta-oe/recipes-benchmark/iozone3/iozone3_263.bb | 111 -------------------- meta-oe/recipes-benchmark/iozone3/iozone3_414.bb | 114 +++++++++++++++++++++ 3 files changed, 114 insertions(+), 143 deletions(-) delete mode 100644 meta-oe/recipes-benchmark/iozone3/iozone3/fileop-arm.patch delete mode 100644 meta-oe/recipes-benchmark/iozone3/iozone3_263.bb create mode 100644 meta-oe/recipes-benchmark/iozone3/iozone3_414.bb (limited to 'meta-oe/recipes-benchmark') 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 c71bfee9d9..0000000000 --- a/meta-oe/recipes-benchmark/iozone3/iozone3/fileop-arm.patch +++ /dev/null @@ -1,32 +0,0 @@ -Modify makefile to compile fileop.c file for ARM architecture. - -Upstream-Status: Inappropriate [not author] -Index: current/makefile -=================================================================== ---- current.orig/makefile 2006-10-14 21:42:36.000000000 +0200 -+++ current/makefile 2006-10-14 21:40:02.000000000 +0200 -@@ -190,9 +190,10 @@ - # - # GNU 'C' compiler Linux build with threads, largefiles, async I/O - # --linux-arm: iozone_linux-arm.o libbif.o libasync.o -+linux-arm: iozone_linux-arm.o libbif.o libasync.o fileop_linux-arm.o - $(CC) -O3 $(LDFLAGS) iozone_linux-arm.o libbif.o libasync.o \ - -lrt -lpthread -o iozone -+ $(CC) -O3 -Dlinux fileop_linux-arm.o -o fileop - - # - # GNU 'C' compiler Linux build with threads, largefiles, async I/O -@@ -725,6 +726,12 @@ - @echo "" - $(CC) -Wall -c -O3 $(CFLAGS) fileop.c -o fileop_linux-AMD64.o - -+fileop_linux-arm.o: fileop.c -+ @echo "" -+ @echo "Building fileop for Linux-arm" -+ @echo "" -+ $(CC) -Wall -c -O3 $(CFLAGS) fileop.c -o fileop_linux-arm.o -+ - fileop_windows.o: fileop.c - @echo "" - @echo "Building fileop for Windows" diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_263.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_263.bb deleted file mode 100644 index 9de0ac7749..0000000000 --- a/meta-oe/recipes-benchmark/iozone3/iozone3_263.bb +++ /dev/null @@ -1,111 +0,0 @@ -SUMMARY = "Filesystem and Disk Benchmarking Tool" -HOMEPAGE = "http://www.iozone.org/" -AUTHOR = "Don Capps , William D. Norcott " -SECTION = "console/tests" -LICENSE = "iozone3" -LIC_FILES_CHKSUM = "file://iozone.c;beginline=237;endline=241;md5=ab42a6185fd0443978871f11a007ac0b" - - -SRC_URI = "http://www.iozone.org/src/current/iozone3_263.tar \ - file://copyright.txt \ - file://fileop-arm.patch \ -" -SRC_URI[md5sum] = "44fd88df361ec4508e10c8d6615245fa" -SRC_URI[sha256sum] = "920fde1a3843539570e2df4aa611e74df102e52d363c5973d5a9d15bdf976461" - -S = "${WORKDIR}/${PN}_${PV}/src/current/" - -EXTRA_OEMAKE_powerpc = "linux-powerpc CC='${CC}'" -EXTRA_OEMAKE_powerpc64 = "linux-powerpc64 CC='${CC}'" -EXTRA_OEMAKE_arm = "linux-arm CC='${CC}'" -EXTRA_OEMAKE = "linux CC='${CC}'" - -TARGET_CC_ARCH += "${LDFLAGS}" - -do_install() { - install -d ${D}${bindir} \ - ${D}${mandir}/man1 \ - ${D}${datadir}/doc/${PN}/examples - - install -m 0755 ${S}/iozone ${D}${bindir} - install -m 0755 ${S}/fileop ${D}${bindir} - install -m 0644 ${WORKDIR}/${PN}_${PV}/docs/iozone.1 ${D}${mandir}/man1/ - install -m 0644 ${WORKDIR}/copyright.txt ${D}${datadir}/doc/${PN}/ - - install -m 0644 ${S}/*.dem ${D}${datadir}/doc/${PN}/examples - install -m 0644 ${S}/client_list ${D}${datadir}/doc/${PN}/examples - install -m 0644 ${S}/Gnuplot.txt ${D}${datadir}/doc/${PN}/examples - - install -m 0755 ${S}/Generate_Graphs ${D}${datadir}/doc/${PN}/examples - install -m 0755 ${S}/gengnuplot.sh ${D}${datadir}/doc/${PN}/examples - install -m 0755 ${S}/report.pl ${D}${datadir}/doc/${PN}/examples - - install -m 0644 ${WORKDIR}/${PN}_${PV}/docs/Iozone_ps.gz ${D}${datadir}/doc/${PN}/ - install -m 0644 ${WORKDIR}/${PN}_${PV}/docs/IOzone_msword_98.pdf ${D}${datadir}/doc/${PN}/ - install -m 0644 ${WORKDIR}/${PN}_${PV}/docs/Run_rules.doc ${D}${datadir}/doc/${PN}/ -} - -FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt" - -# LICENSE: -# -# Copyright 1991, 1992, 1994, 1998, 1999, 2002 William D. Norcott -# -# License to freely use and distribute this software is hereby granted -# by the author, subject to the condition that this copyright notice -# remains intact. The author retains the exclusive right to publish -# derivative works based on this work, including, but not limited to -# revised versions of this work. -# - -# -# Below is author reply to question about distributing iozone3 in -# OpenEmbedded: -# -# ======================================================================== -# -# Marcin, -# -# Re-distribution is permitted as long as the copyright is -# maintained and the source code is not changed. I do not -# see a problem with your mods to enable fileop for Linux-arm, -# as these mods have been returned to the Iozone folks, -# and they have been accepted for inclusion in the next -# release :-) -# -# Thank you for your contribution, -# Don Capps -# -# ----- Original Message ----- -# From: "Marcin Juszkiewicz" -# To: "Don Capps" ; "William D. Norcott" -# -# Sent: Sunday, October 29, 2006 4:55 PM -# Subject: iozone3 263 patch for arm and License question -# -# -# > Morning -# > -# > I want to include iozone3 in OpenEmbedded [1] metadata to give it for -# > other developers. Currently OE is used to build few distributions for -# > misc platforms: ARM, SH3, SH4, x86, PowerPC and different types of -# > machines (PDA, settopbox, devboards, desktops, thin clients, routers). -# > -# > According to your distribution of derivations is forbidden. Packaging -# > iozone3 in OpenEmbedded will not involve any source code changes. But -# > when I was building it for ARM I discovered that fileop binary was not -# > built - so I created patch for it (attached). Not yet tested it on target -# > device. -# > -# > Thus, I seek your written permission via e-mail to distribute a package of -# > the unmodified source code and also a package of the pre-compiled binary. -# > Your copyright statement will be included in the package. -# > -# > -# > 1. http://www.openembedded.org/ -# > -# > Regards -# > -- -# > JID: hrw-jabber.org -# > OpenEmbedded developer/consultant - diff --git a/meta-oe/recipes-benchmark/iozone3/iozone3_414.bb b/meta-oe/recipes-benchmark/iozone3/iozone3_414.bb new file mode 100644 index 0000000000..14373b9e01 --- /dev/null +++ b/meta-oe/recipes-benchmark/iozone3/iozone3_414.bb @@ -0,0 +1,114 @@ +SUMMARY = "Filesystem and Disk Benchmarking Tool" +HOMEPAGE = "http://www.iozone.org/" +AUTHOR = "Don Capps , William D. Norcott " +SECTION = "console/tests" +LICENSE = "iozone3" +LIC_FILES_CHKSUM = "file://iozone.c;beginline=266;endline=270;md5=ab42a6185fd0443978871f11a007ac0b" + +SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ + file://copyright.txt \ +" +SRC_URI[md5sum] = "a40dcda593f5841d0aaffe9f21172020" +SRC_URI[sha256sum] = "9f60e854d7bc5bc3de15355cf5621e15098bd744a26845d11730b3060f4a5fff" + +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_arm = "linux-arm CC='${CC}' GCC='${CC}'" +EXTRA_OEMAKE = "linux CC='${CC}' GCC='${CC}'" + +TARGET_CC_ARCH += "${LDFLAGS}" + +do_install() { + install -d ${D}${bindir} \ + ${D}${mandir}/man1 \ + ${D}${datadir}/doc/${BPN}/examples + + 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}/*.dem ${D}${datadir}/doc/${BPN}/examples + install -m 0644 ${S}/client_list ${D}${datadir}/doc/${BPN}/examples + install -m 0644 ${S}/Gnuplot.txt ${D}${datadir}/doc/${BPN}/examples + + install -m 0755 ${S}/Generate_Graphs ${D}${datadir}/doc/${BPN}/examples + 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}/ +} + +FILES_${PN} += "${datadir}/doc/${PN}/copyright.txt" + +# LICENSE: +# +# Copyright 1991, 1992, 1994, 1998, 1999, 2002 William D. Norcott +# +# License to freely use and distribute this software is hereby granted +# by the author, subject to the condition that this copyright notice +# remains intact. The author retains the exclusive right to publish +# derivative works based on this work, including, but not limited to +# revised versions of this work. +# + +# +# Below is author reply to question about distributing iozone3 in +# OpenEmbedded: +# +# ======================================================================== +# +# Marcin, +# +# Re-distribution is permitted as long as the copyright is +# maintained and the source code is not changed. I do not +# see a problem with your mods to enable fileop for Linux-arm, +# as these mods have been returned to the Iozone folks, +# and they have been accepted for inclusion in the next +# release :-) +# +# Thank you for your contribution, +# Don Capps +# +# ----- Original Message ----- +# From: "Marcin Juszkiewicz" +# To: "Don Capps" ; "William D. Norcott" +# +# Sent: Sunday, October 29, 2006 4:55 PM +# Subject: iozone3 263 patch for arm and License question +# +# +# > Morning +# > +# > I want to include iozone3 in OpenEmbedded [1] metadata to give it for +# > other developers. Currently OE is used to build few distributions for +# > misc platforms: ARM, SH3, SH4, x86, PowerPC and different types of +# > machines (PDA, settopbox, devboards, desktops, thin clients, routers). +# > +# > According to your distribution of derivations is forbidden. Packaging +# > iozone3 in OpenEmbedded will not involve any source code changes. But +# > when I was building it for ARM I discovered that fileop binary was not +# > built - so I created patch for it (attached). Not yet tested it on target +# > device. +# > +# > Thus, I seek your written permission via e-mail to distribute a package of +# > the unmodified source code and also a package of the pre-compiled binary. +# > Your copyright statement will be included in the package. +# > +# > +# > 1. http://www.openembedded.org/ +# > +# > Regards +# > -- +# > JID: hrw-jabber.org +# > OpenEmbedded developer/consultant + -- cgit v1.2.3-54-g00ecf