diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-benchmark/fio')
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch | 13 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch | 38 | ||||
-rw-r--r-- | external/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.17.bb (renamed from external/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.12.bb) | 12 |
3 files changed, 46 insertions, 17 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch b/external/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch index 327b9f5b..c9c3a08d 100644 --- a/external/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch +++ b/external/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch @@ -16,8 +16,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> tools/hist/fiologparser_hist.py | 2 +- tools/hist/half-bins.py | 2 +- tools/plot/fio2gnuplot | 2 +- - t/steadystate_tests.py | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) + 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/fio_jsonplus_clat2csv b/tools/fio_jsonplus_clat2csv index 78a007e5..0524b6e6 100755 @@ -79,16 +78,6 @@ index 4d1815cf..509141af 100755 # Note: this script is python2 and python3 compatible. # # Copyright (C) 2013 eNovance SAS <licensing@enovance.com> -diff --git a/t/steadystate_tests.py b/t/steadystate_tests.py -index 50254dcc..95e7dfde 100755 ---- a/t/steadystate_tests.py -+++ b/t/steadystate_tests.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.7 -+#!/usr/bin/env python - # Note: this script is python2 and python 3 compatible. - # - # steadystate_tests.py -- 2.17.1 diff --git a/external/meta-openembedded/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch b/external/meta-openembedded/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch new file mode 100644 index 00000000..068b0216 --- /dev/null +++ b/external/meta-openembedded/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch @@ -0,0 +1,38 @@ +python3: change four shebangs to python3 + +Upstream-Status: Pending + +Signed-off-by: Joe Slater <joe.slater@windriver.com> + +--- a/tools/fio_jsonplus_clat2csv ++++ b/tools/fio_jsonplus_clat2csv +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # Note: this script is python2 and python3 compatible. + # + # fio_jsonplus_clat2csv +--- a/tools/fiologparser.py ++++ b/tools/fiologparser.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # Note: this script is python2 and python 3 compatible. + # + # fiologparser.py +--- a/tools/hist/fiologparser_hist.py ++++ b/tools/hist/fiologparser_hist.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + """ + Utility for converting *_clat_hist* files generated by fio into latency statistics. + +--- a/tools/plot/fio2gnuplot ++++ b/tools/plot/fio2gnuplot +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python ++#!/usr/bin/env python3 + # Note: this script is python2 and python3 compatible. + # + # Copyright (C) 2013 eNovance SAS <licensing@enovance.com> diff --git a/external/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.12.bb b/external/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.17.bb index 2deb42db..759d1087 100644 --- a/external/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.12.bb +++ b/external/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.17.bb @@ -10,20 +10,22 @@ SECTION = "console/tests" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "libaio zlib" -RDEPENDS_${PN} = "python bash" +DEPENDS = "libaio zlib coreutils-native" +DEPENDS += "${@bb.utils.contains('MACHINE_FEATURES', 'pmem', 'pmdk', '', d)}" +RDEPENDS_${PN} = "python3-core bash" PACKAGECONFIG_NUMA = "numa" # ARM does not currently support NUMA PACKAGECONFIG_NUMA_arm = "" +PACKAGECONFIG_NUMA_armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -# rev for v3.8 -SRCREV = "16500b5a0b03ee0142d592bb74a46943a223b06e" +SRCREV = "08ce9dc20b8a4e55db7af6d869ddfa49b4a02d03" SRC_URI = "git://git.kernel.dk/fio.git \ file://0001-update-the-interpreter-paths.patch \ + file://python3_shebangs.patch \ " S = "${WORKDIR}/git" @@ -32,7 +34,7 @@ S = "${WORKDIR}/git" DISABLE_STATIC = "" EXTRA_OEMAKE = "CC='${CC}' LDFLAGS='${LDFLAGS}'" -EXTRA_OECONF = "--disable-optimizations" +EXTRA_OECONF = "${@bb.utils.contains('MACHINE_FEATURES', 'x86', '--disable-optimizations', '', d)}" do_configure() { ./configure ${EXTRA_OECONF} |