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>

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 @@
-From 55078e494bdf7da7dd9cb76077fa7ac2a66b6dd6 Mon Sep 17 00:00:00 2001
-From: Mingli Yu <mingli.yu@windriver.com>
-Date: Fri, 20 Jul 2018 02:33:25 -0700
-Subject: [PATCH] update the interpreter paths
-
-Update the interpreter path to make it more
-compatible
-
-Upstream-Status: Pending
-
-Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
----
- tools/fio_jsonplus_clat2csv     | 2 +-
- tools/fiologparser.py           | 2 +-
- tools/genfio                    | 2 +-
- tools/hist/fiologparser_hist.py | 2 +-
- tools/hist/half-bins.py         | 2 +-
- tools/plot/fio2gnuplot          | 2 +-
- 6 files changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/tools/fio_jsonplus_clat2csv b/tools/fio_jsonplus_clat2csv
-index 78a007e5..0524b6e6 100755
---- a/tools/fio_jsonplus_clat2csv
-+++ b/tools/fio_jsonplus_clat2csv
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.7
-+#!/usr/bin/env python
- # Note: this script is python2 and python3 compatible.
- #
- # fio_jsonplus_clat2csv
-diff --git a/tools/fiologparser.py b/tools/fiologparser.py
-index cc29f1c7..ea60e783 100755
---- a/tools/fiologparser.py
-+++ b/tools/fiologparser.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.7
-+#!/usr/bin/env python
- # Note: this script is python2 and python 3 compatible.
- #
- # fiologparser.py
-diff --git a/tools/genfio b/tools/genfio
-index 286d814d..8518bbcc 100755
---- a/tools/genfio
-+++ b/tools/genfio
-@@ -1,4 +1,4 @@
--#!/usr/bin/bash
-+#!/bin/bash
- #
- #  Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
- #  Author: Erwan Velu  <erwan@enovance.com>
-diff --git a/tools/hist/fiologparser_hist.py b/tools/hist/fiologparser_hist.py
-index 8910d5fa..b77c2933 100755
---- a/tools/hist/fiologparser_hist.py
-+++ b/tools/hist/fiologparser_hist.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.7
-+#!/usr/bin/env python
- """ 
-     Utility for converting *_clat_hist* files generated by fio into latency statistics.
-     
-diff --git a/tools/hist/half-bins.py b/tools/hist/half-bins.py
-index 1bba8ff7..58d53e36 100755
---- a/tools/hist/half-bins.py
-+++ b/tools/hist/half-bins.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.7
-+#!/usr/bin/env python
- """ Cut the number bins in half in fio histogram output. Example usage:
- 
-         $ half-bins.py -c 2 output_clat_hist.1.log > smaller_clat_hist.1.log
-diff --git a/tools/plot/fio2gnuplot b/tools/plot/fio2gnuplot
-index 4d1815cf..509141af 100755
---- a/tools/plot/fio2gnuplot
-+++ b/tools/plot/fio2gnuplot
-@@ -1,4 +1,4 @@
--#!/usr/bin/python2.7
-+#!/usr/bin/env python
- # Note: this script is python2 and python3 compatible.
- #
- #  Copyright (C) 2013 eNovance SAS <licensing@enovance.com>
--- 
-2.17.1
-
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 @@
-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/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 = ""
 PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}"
 PACKAGECONFIG[numa] = ",--disable-numa,numactl"
 
-SRCREV = "08ce9dc20b8a4e55db7af6d869ddfa49b4a02d03"
+SRCREV = "d13596b225baf61425a9ca92b0583fc3fa97765d"
 SRC_URI = "git://git.kernel.dk/fio.git \
-          file://0001-update-the-interpreter-paths.patch \
-          file://python3_shebangs.patch \
 "
 
 S = "${WORKDIR}/git"