diff options
author | Mingli Yu <mingli.yu@windriver.com> | 2020-08-10 01:33:37 -0700 |
---|---|---|
committer | Khem Raj <raj.khem@gmail.com> | 2020-08-10 11:04:21 -0700 |
commit | b3d6f4f85f0c0b27aa12bcbe6c981f78706a716a (patch) | |
tree | 1d3707bcbc57cc12016d38a8ead9ff78c97ccf4c /meta-oe | |
parent | a7c9aa13dd94712ea49f535fbbf38d2db54cf7e2 (diff) | |
download | meta-openembedded-b3d6f4f85f0c0b27aa12bcbe6c981f78706a716a.tar.gz |
fio: upgrade to 3.21
Remove 2 patches as these logics have been already included in the
new version as [1] and [2].
[1] https://git.kernel.dk/?p=fio.git;a=commit;h=8629f5f5c24e8a02c0a168cff22a40ec0788bb2d
[2] https://git.kernel.dk/?p=fio.git;a=commit;h=10ee8843e79763e8b6ff967f8a2b5d5b92411f90
Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe')
-rw-r--r-- | meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch | 83 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch | 38 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/fio/fio_3.21.bb (renamed from meta-oe/recipes-benchmark/fio/fio_3.17.bb) | 4 |
3 files changed, 1 insertions, 124 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 deleted file mode 100644 index c9c3a08df..000000000 --- a/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch +++ /dev/null | |||
@@ -1,83 +0,0 @@ | |||
1 | From 55078e494bdf7da7dd9cb76077fa7ac2a66b6dd6 Mon Sep 17 00:00:00 2001 | ||
2 | From: Mingli Yu <mingli.yu@windriver.com> | ||
3 | Date: Fri, 20 Jul 2018 02:33:25 -0700 | ||
4 | Subject: [PATCH] update the interpreter paths | ||
5 | |||
6 | Update the interpreter path to make it more | ||
7 | compatible | ||
8 | |||
9 | Upstream-Status: Pending | ||
10 | |||
11 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | ||
12 | --- | ||
13 | tools/fio_jsonplus_clat2csv | 2 +- | ||
14 | tools/fiologparser.py | 2 +- | ||
15 | tools/genfio | 2 +- | ||
16 | tools/hist/fiologparser_hist.py | 2 +- | ||
17 | tools/hist/half-bins.py | 2 +- | ||
18 | tools/plot/fio2gnuplot | 2 +- | ||
19 | 6 files changed, 6 insertions(+), 6 deletions(-) | ||
20 | |||
21 | diff --git a/tools/fio_jsonplus_clat2csv b/tools/fio_jsonplus_clat2csv | ||
22 | index 78a007e5..0524b6e6 100755 | ||
23 | --- a/tools/fio_jsonplus_clat2csv | ||
24 | +++ b/tools/fio_jsonplus_clat2csv | ||
25 | @@ -1,4 +1,4 @@ | ||
26 | -#!/usr/bin/python2.7 | ||
27 | +#!/usr/bin/env python | ||
28 | # Note: this script is python2 and python3 compatible. | ||
29 | # | ||
30 | # fio_jsonplus_clat2csv | ||
31 | diff --git a/tools/fiologparser.py b/tools/fiologparser.py | ||
32 | index cc29f1c7..ea60e783 100755 | ||
33 | --- a/tools/fiologparser.py | ||
34 | +++ b/tools/fiologparser.py | ||
35 | @@ -1,4 +1,4 @@ | ||
36 | -#!/usr/bin/python2.7 | ||
37 | +#!/usr/bin/env python | ||
38 | # Note: this script is python2 and python 3 compatible. | ||
39 | # | ||
40 | # fiologparser.py | ||
41 | diff --git a/tools/genfio b/tools/genfio | ||
42 | index 286d814d..8518bbcc 100755 | ||
43 | --- a/tools/genfio | ||
44 | +++ b/tools/genfio | ||
45 | @@ -1,4 +1,4 @@ | ||
46 | -#!/usr/bin/bash | ||
47 | +#!/bin/bash | ||
48 | # | ||
49 | # Copyright (C) 2013 eNovance SAS <licensing@enovance.com> | ||
50 | # Author: Erwan Velu <erwan@enovance.com> | ||
51 | diff --git a/tools/hist/fiologparser_hist.py b/tools/hist/fiologparser_hist.py | ||
52 | index 8910d5fa..b77c2933 100755 | ||
53 | --- a/tools/hist/fiologparser_hist.py | ||
54 | +++ b/tools/hist/fiologparser_hist.py | ||
55 | @@ -1,4 +1,4 @@ | ||
56 | -#!/usr/bin/python2.7 | ||
57 | +#!/usr/bin/env python | ||
58 | """ | ||
59 | Utility for converting *_clat_hist* files generated by fio into latency statistics. | ||
60 | |||
61 | diff --git a/tools/hist/half-bins.py b/tools/hist/half-bins.py | ||
62 | index 1bba8ff7..58d53e36 100755 | ||
63 | --- a/tools/hist/half-bins.py | ||
64 | +++ b/tools/hist/half-bins.py | ||
65 | @@ -1,4 +1,4 @@ | ||
66 | -#!/usr/bin/python2.7 | ||
67 | +#!/usr/bin/env python | ||
68 | """ Cut the number bins in half in fio histogram output. Example usage: | ||
69 | |||
70 | $ half-bins.py -c 2 output_clat_hist.1.log > smaller_clat_hist.1.log | ||
71 | diff --git a/tools/plot/fio2gnuplot b/tools/plot/fio2gnuplot | ||
72 | index 4d1815cf..509141af 100755 | ||
73 | --- a/tools/plot/fio2gnuplot | ||
74 | +++ b/tools/plot/fio2gnuplot | ||
75 | @@ -1,4 +1,4 @@ | ||
76 | -#!/usr/bin/python2.7 | ||
77 | +#!/usr/bin/env python | ||
78 | # Note: this script is python2 and python3 compatible. | ||
79 | # | ||
80 | # Copyright (C) 2013 eNovance SAS <licensing@enovance.com> | ||
81 | -- | ||
82 | 2.17.1 | ||
83 | |||
diff --git a/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch b/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch deleted file mode 100644 index 068b02164..000000000 --- a/meta-oe/recipes-benchmark/fio/files/python3_shebangs.patch +++ /dev/null | |||
@@ -1,38 +0,0 @@ | |||
1 | python3: change four shebangs to python3 | ||
2 | |||
3 | Upstream-Status: Pending | ||
4 | |||
5 | Signed-off-by: Joe Slater <joe.slater@windriver.com> | ||
6 | |||
7 | --- a/tools/fio_jsonplus_clat2csv | ||
8 | +++ b/tools/fio_jsonplus_clat2csv | ||
9 | @@ -1,4 +1,4 @@ | ||
10 | -#!/usr/bin/env python | ||
11 | +#!/usr/bin/env python3 | ||
12 | # Note: this script is python2 and python3 compatible. | ||
13 | # | ||
14 | # fio_jsonplus_clat2csv | ||
15 | --- a/tools/fiologparser.py | ||
16 | +++ b/tools/fiologparser.py | ||
17 | @@ -1,4 +1,4 @@ | ||
18 | -#!/usr/bin/env python | ||
19 | +#!/usr/bin/env python3 | ||
20 | # Note: this script is python2 and python 3 compatible. | ||
21 | # | ||
22 | # fiologparser.py | ||
23 | --- a/tools/hist/fiologparser_hist.py | ||
24 | +++ b/tools/hist/fiologparser_hist.py | ||
25 | @@ -1,4 +1,4 @@ | ||
26 | -#!/usr/bin/env python | ||
27 | +#!/usr/bin/env python3 | ||
28 | """ | ||
29 | Utility for converting *_clat_hist* files generated by fio into latency statistics. | ||
30 | |||
31 | --- a/tools/plot/fio2gnuplot | ||
32 | +++ b/tools/plot/fio2gnuplot | ||
33 | @@ -1,4 +1,4 @@ | ||
34 | -#!/usr/bin/env python | ||
35 | +#!/usr/bin/env python3 | ||
36 | # Note: this script is python2 and python3 compatible. | ||
37 | # | ||
38 | # Copyright (C) 2013 eNovance SAS <licensing@enovance.com> | ||
diff --git a/meta-oe/recipes-benchmark/fio/fio_3.17.bb b/meta-oe/recipes-benchmark/fio/fio_3.21.bb index 759d1087c..83f38fc7b 100644 --- a/meta-oe/recipes-benchmark/fio/fio_3.17.bb +++ b/meta-oe/recipes-benchmark/fio/fio_3.21.bb | |||
@@ -22,10 +22,8 @@ PACKAGECONFIG_NUMA_armeb = "" | |||
22 | PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" | 22 | PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" |
23 | PACKAGECONFIG[numa] = ",--disable-numa,numactl" | 23 | PACKAGECONFIG[numa] = ",--disable-numa,numactl" |
24 | 24 | ||
25 | SRCREV = "08ce9dc20b8a4e55db7af6d869ddfa49b4a02d03" | 25 | SRCREV = "d13596b225baf61425a9ca92b0583fc3fa97765d" |
26 | SRC_URI = "git://git.kernel.dk/fio.git \ | 26 | SRC_URI = "git://git.kernel.dk/fio.git \ |
27 | file://0001-update-the-interpreter-paths.patch \ | ||
28 | file://python3_shebangs.patch \ | ||
29 | " | 27 | " |
30 | 28 | ||
31 | S = "${WORKDIR}/git" | 29 | S = "${WORKDIR}/git" |