From c3916ef18918ff4497a25c6e0c697a1bc5a74d2e Mon Sep 17 00:00:00 2001 From: Mingli Yu Date: Fri, 16 Nov 2018 01:32:09 -0800 Subject: fio: Upgrade to 3.12 Refresh 0001-update-the-interpreter-paths.patch as the folder unit_tests/ is renamed to t/ in below commit: c44d2c6e Move steady state unit test to t/ Signed-off-by: Mingli Yu Signed-off-by: Khem Raj Signed-off-by: Armin Kuster --- .../files/0001-update-the-interpreter-paths.patch | 8 ++-- meta-oe/recipes-benchmark/fio/fio_3.12.bb | 45 ++++++++++++++++++++++ meta-oe/recipes-benchmark/fio/fio_3.8.bb | 45 ---------------------- 3 files changed, 49 insertions(+), 49 deletions(-) create mode 100644 meta-oe/recipes-benchmark/fio/fio_3.12.bb delete mode 100644 meta-oe/recipes-benchmark/fio/fio_3.8.bb diff --git a/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch b/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch index 276a24d89..327b9f5b7 100644 --- a/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch +++ b/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch @@ -16,7 +16,7 @@ Signed-off-by: Mingli Yu tools/hist/fiologparser_hist.py | 2 +- tools/hist/half-bins.py | 2 +- tools/plot/fio2gnuplot | 2 +- - unit_tests/steadystate_tests.py | 2 +- + t/steadystate_tests.py | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tools/fio_jsonplus_clat2csv b/tools/fio_jsonplus_clat2csv @@ -79,10 +79,10 @@ index 4d1815cf..509141af 100755 # Note: this script is python2 and python3 compatible. # # Copyright (C) 2013 eNovance SAS -diff --git a/unit_tests/steadystate_tests.py b/unit_tests/steadystate_tests.py +diff --git a/t/steadystate_tests.py b/t/steadystate_tests.py index 50254dcc..95e7dfde 100755 ---- a/unit_tests/steadystate_tests.py -+++ b/unit_tests/steadystate_tests.py +--- a/t/steadystate_tests.py ++++ b/t/steadystate_tests.py @@ -1,4 +1,4 @@ -#!/usr/bin/python2.7 +#!/usr/bin/env python diff --git a/meta-oe/recipes-benchmark/fio/fio_3.12.bb b/meta-oe/recipes-benchmark/fio/fio_3.12.bb new file mode 100644 index 000000000..2deb42db9 --- /dev/null +++ b/meta-oe/recipes-benchmark/fio/fio_3.12.bb @@ -0,0 +1,45 @@ +SUMMARY = "Filesystem and hardware benchmark and stress tool" +DESCRIPTION = "fio is an I/O tool meant to be used both for benchmark and \ +stress/hardware verification. It has support for a number of I/O engines, \ +I/O priorities (for newer Linux kernels), rate I/O, forked or threaded jobs, \ +and much more. It can work on block devices as well as files. fio accepts \ +job descriptions in a simple-to-understand text format. Several example job \ +files are included. fio displays all sorts of I/O performance information." +HOMEPAGE = "http://freecode.com/projects/fio" +SECTION = "console/tests" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libaio zlib" +RDEPENDS_${PN} = "python bash" + +PACKAGECONFIG_NUMA = "numa" +# ARM does not currently support NUMA +PACKAGECONFIG_NUMA_arm = "" + +PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" +PACKAGECONFIG[numa] = ",--disable-numa,numactl" + +# rev for v3.8 +SRCREV = "16500b5a0b03ee0142d592bb74a46943a223b06e" +SRC_URI = "git://git.kernel.dk/fio.git \ + file://0001-update-the-interpreter-paths.patch \ +" + +S = "${WORKDIR}/git" + +# avoids build breaks when using no-static-libs.inc +DISABLE_STATIC = "" + +EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" +EXTRA_OECONF = "--disable-optimizations" + +do_configure() { + ./configure ${EXTRA_OECONF} +} + +do_install() { + oe_runmake install DESTDIR=${D} prefix=${prefix} mandir=${mandir} + install -d ${D}/${docdir}/${PN} + cp -R --no-dereference --preserve=mode,links -v ${S}/examples ${D}/${docdir}/${PN}/ +} diff --git a/meta-oe/recipes-benchmark/fio/fio_3.8.bb b/meta-oe/recipes-benchmark/fio/fio_3.8.bb deleted file mode 100644 index 5bc48b052..000000000 --- a/meta-oe/recipes-benchmark/fio/fio_3.8.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "Filesystem and hardware benchmark and stress tool" -DESCRIPTION = "fio is an I/O tool meant to be used both for benchmark and \ -stress/hardware verification. It has support for a number of I/O engines, \ -I/O priorities (for newer Linux kernels), rate I/O, forked or threaded jobs, \ -and much more. It can work on block devices as well as files. fio accepts \ -job descriptions in a simple-to-understand text format. Several example job \ -files are included. fio displays all sorts of I/O performance information." -HOMEPAGE = "http://freecode.com/projects/fio" -SECTION = "console/tests" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" - -DEPENDS = "libaio zlib" -RDEPENDS_${PN} = "python bash" - -PACKAGECONFIG_NUMA = "numa" -# ARM does not currently support NUMA -PACKAGECONFIG_NUMA_arm = "" - -PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" -PACKAGECONFIG[numa] = ",--disable-numa,numactl" - -# rev for v3.8 -SRCREV = "bfd986752ad053175423ffe3bbbeb07803f8ad4a" -SRC_URI = "git://git.kernel.dk/fio.git \ - file://0001-update-the-interpreter-paths.patch \ -" - -S = "${WORKDIR}/git" - -# avoids build breaks when using no-static-libs.inc -DISABLE_STATIC = "" - -EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" -EXTRA_OECONF = "--disable-optimizations" - -do_configure() { - ./configure ${EXTRA_OECONF} -} - -do_install() { - oe_runmake install DESTDIR=${D} prefix=${prefix} mandir=${mandir} - install -d ${D}/${docdir}/${PN} - cp -R --no-dereference --preserve=mode,links -v ${S}/examples ${D}/${docdir}/${PN}/ -} -- cgit v1.2.3-54-g00ecf