From caf04f8cb04a7540bfbd1b7b9a97e9d2c4546240 Mon Sep 17 00:00:00 2001 From: lyn1001 Date: Sat, 19 Sep 2020 11:50:23 +0800 Subject: [PATCH] Modify python2.7 to python3 with requires --- ...y-python2.7-to-python3-with-requires.patch | 69 +++++++++++++++++++ fio.spec | 7 +- 2 files changed, 74 insertions(+), 2 deletions(-) create mode 100644 Modify-python2.7-to-python3-with-requires.patch diff --git a/Modify-python2.7-to-python3-with-requires.patch b/Modify-python2.7-to-python3-with-requires.patch new file mode 100644 index 0000000..3bc0783 --- /dev/null +++ b/Modify-python2.7-to-python3-with-requires.patch @@ -0,0 +1,69 @@ +From 6cc4a4d2593150cf9ae0f37084b3c583a2ab7e6a Mon Sep 17 00:00:00 2001 +From: root +Date: Sat, 19 Sep 2020 10:43:41 +0800 +Subject: [PATCH] c + + +diff --git a/fio_jsonplus_clat2csv b/fio_jsonplus_clat2csv +index 78a007e..a23e799 100755 +--- a/tools/fio_jsonplus_clat2csv ++++ b/tools/fio_jsonplus_clat2csv +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.7 ++#!/usr/bin/python3 + # Note: this script is python2 and python3 compatible. + # + # fio_jsonplus_clat2csv +diff --git a/tools/fiologparser.py b/tools/fiologparser.py +index cc29f1c..49f2639 100755 +--- a/tools/fiologparser.py ++++ b/tools/fiologparser.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.7 ++#!/usr/bin/python3 + # Note: this script is python2 and python 3 compatible. + # + # fiologparser.py +diff --git a/tools/hist/fiologparser_hist.py b/tools/hist/fiologparser_hist.py +index 8910d5f..9b64fe7 100755 +--- a/tools/hist/fiologparser_hist.py ++++ b/tools/hist/fiologparser_hist.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.7 ++#!/usr/bin/python3 + """ + 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 1bba8ff..e5a1418 100755 +--- a/tools/hist/half-bins.py ++++ b/tools/hist/half-bins.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.7 ++#!/usr/bin/python3 + """ 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 4d1815c..28b9952 100755 +--- a/tools/plot/fio2gnuplot ++++ b/tools/plot/fio2gnuplot +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.7 ++#!/usr/bin/python3 + # 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 +index 50254dc..25008d0 100755 +--- a/unit_tests/steadystate_tests.py ++++ b/unit_tests/steadystate_tests.py +@@ -1,4 +1,4 @@ +-#!/usr/bin/python2.7 ++#!/usr/bin/python3 + # Note: this script is python2 and python 3 compatible. + # + # steadystate_tests.py +-- +2.27.0 + diff --git a/fio.spec b/fio.spec index 41336e9..0381a4d 100644 --- a/fio.spec +++ b/fio.spec @@ -1,6 +1,6 @@ Name: fio Version: 3.7 -Release: 6 +Release: 7 Summary: Versatile IO workload generator License: GPLv2 URL: http://git.kernel.dk/?p=fio.git;a=summary @@ -11,7 +11,7 @@ BuildRequires: libaio-devel zlib-devel librbd1-devel numactl-devel librdmacm-de BuildRequires: libpmem-devel libpmemblk-devel %endif Patch0000: fix-glibc-error.patch - +Patch0001: Modify-python2.7-to-python3-with-requires.patch %description fio is a tool used to spawn many threads or processes that perform a specific type of io operation specified by the user.It accepts many global parameters inherited @@ -45,6 +45,9 @@ export EXTFLAGS="$RPM_OPT_FLAGS" LDFLAGS="$RPM_LD_FLAGS" %{_mandir}/man1/* %changelog +* Sat Sep 19 2020 yanan li - 3.7-7 +- Modify python2.7 to python3 with requires + * Thu Jul 23 2020 wutao - 3.7-5 - fix build error because of updating glibc -- Gitee