summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMingli Yu <mingli.yu@windriver.com>2018-11-16 01:32:09 -0800
committerArmin Kuster <akuster808@gmail.com>2018-11-18 09:54:02 -0800
commitc3916ef18918ff4497a25c6e0c697a1bc5a74d2e (patch)
treec666700d1238762ee7922d4bfc550013120728a2
parent33b7f325ea3fc329b222d963275e6e18cba2ede8 (diff)
downloadmeta-openembedded-c3916ef18918ff4497a25c6e0c697a1bc5a74d2e.tar.gz
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 <mingli.yu@windriver.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch8
-rw-r--r--meta-oe/recipes-benchmark/fio/fio_3.12.bb (renamed from meta-oe/recipes-benchmark/fio/fio_3.8.bb)2
2 files changed, 5 insertions, 5 deletions
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 <mingli.yu@windriver.com>
16 tools/hist/fiologparser_hist.py | 2 +- 16 tools/hist/fiologparser_hist.py | 2 +-
17 tools/hist/half-bins.py | 2 +- 17 tools/hist/half-bins.py | 2 +-
18 tools/plot/fio2gnuplot | 2 +- 18 tools/plot/fio2gnuplot | 2 +-
19 unit_tests/steadystate_tests.py | 2 +- 19 t/steadystate_tests.py | 2 +-
20 7 files changed, 7 insertions(+), 7 deletions(-) 20 7 files changed, 7 insertions(+), 7 deletions(-)
21 21
22diff --git a/tools/fio_jsonplus_clat2csv b/tools/fio_jsonplus_clat2csv 22diff --git a/tools/fio_jsonplus_clat2csv b/tools/fio_jsonplus_clat2csv
@@ -79,10 +79,10 @@ index 4d1815cf..509141af 100755
79 # Note: this script is python2 and python3 compatible. 79 # Note: this script is python2 and python3 compatible.
80 # 80 #
81 # Copyright (C) 2013 eNovance SAS <licensing@enovance.com> 81 # Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
82diff --git a/unit_tests/steadystate_tests.py b/unit_tests/steadystate_tests.py 82diff --git a/t/steadystate_tests.py b/t/steadystate_tests.py
83index 50254dcc..95e7dfde 100755 83index 50254dcc..95e7dfde 100755
84--- a/unit_tests/steadystate_tests.py 84--- a/t/steadystate_tests.py
85+++ b/unit_tests/steadystate_tests.py 85+++ b/t/steadystate_tests.py
86@@ -1,4 +1,4 @@ 86@@ -1,4 +1,4 @@
87-#!/usr/bin/python2.7 87-#!/usr/bin/python2.7
88+#!/usr/bin/env python 88+#!/usr/bin/env python
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.8.bb b/meta-oe/recipes-benchmark/fio/fio_3.12.bb
index 5bc48b052..2deb42db9 100644
--- a/meta-oe/recipes-benchmark/fio/fio_3.8.bb
+++ b/meta-oe/recipes-benchmark/fio/fio_3.12.bb
@@ -21,7 +21,7 @@ PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}"
21PACKAGECONFIG[numa] = ",--disable-numa,numactl" 21PACKAGECONFIG[numa] = ",--disable-numa,numactl"
22 22
23# rev for v3.8 23# rev for v3.8
24SRCREV = "bfd986752ad053175423ffe3bbbeb07803f8ad4a" 24SRCREV = "16500b5a0b03ee0142d592bb74a46943a223b06e"
25SRC_URI = "git://git.kernel.dk/fio.git \ 25SRC_URI = "git://git.kernel.dk/fio.git \
26 file://0001-update-the-interpreter-paths.patch \ 26 file://0001-update-the-interpreter-paths.patch \
27" 27"