From bfbb2b945aab5d9dcce39eb20207731e7d1845c2 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Thu, 6 Feb 2020 13:58:08 +0800 Subject: [PATCH 1/4] remove python2 dependency --- 0000-huawei-remove-python2-dependency.patch | 36 +++++++++++++++++++++ blktrace.spec | 14 ++++++-- 2 files changed, 47 insertions(+), 3 deletions(-) create mode 100644 0000-huawei-remove-python2-dependency.patch diff --git a/0000-huawei-remove-python2-dependency.patch b/0000-huawei-remove-python2-dependency.patch new file mode 100644 index 0000000..4ace0f6 --- /dev/null +++ b/0000-huawei-remove-python2-dependency.patch @@ -0,0 +1,36 @@ +From d8b5a8105a76d390ae9bb197448235dfc663fdac Mon Sep 17 00:00:00 2001 +From: sunshihao +Date: Mon, 3 Feb 2020 17:58:10 +0800 +Subject: [PATCH] blktrace: remove python2 dedpendency + +in order to remove python2 dependency,we +use python3 as Default interpreter. + +Signed-off-by: sunshihao +--- + btt/bno_plot.py | 2 +- + btt/btt_plot.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/btt/bno_plot.py b/btt/bno_plot.py +index aa92480..bb0cae7 100644 +--- a/btt/bno_plot.py ++++ b/btt/bno_plot.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # btt blkno plotting interface + # +diff --git a/btt/btt_plot.py b/btt/btt_plot.py +index b81dad5..7e10f92 100755 +--- a/btt/btt_plot.py ++++ b/btt/btt_plot.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # btt_plot.py: Generate matplotlib plots for BTT generate data files + # +-- +1.8.3.1 diff --git a/blktrace.spec b/blktrace.spec index b47e7b5..c77267a 100644 --- a/blktrace.spec +++ b/blktrace.spec @@ -1,18 +1,20 @@ Name: blktrace Version: 1.2.0 -Release: 9 +Release: 11 Summary: Block IO tracer in the Linux kernel License: GPLv2+ Source: http://brick.kernel.dk/snaps/blktrace-%{version}.tar.bz2 URL: http://brick.kernel.dk/snaps -BuildRequires: gcc, git, xz, libaio-devel, python2, librsvg2-devel blktrace sysstat theora-tools +BuildRequires: gcc, git, xz, libaio-devel, python3, librsvg2-devel blktrace sysstat theora-tools Provides: iowatcher Obsoletes: iowatcher -Requires: python2 +Requires: python3 Patch0: blktrace-fix-btt-overflow.patch +Patch9000: 0000-huawei-remove-python2-dependency.patch + %description blktrace is a block layer IO tracing mechanism which provides detailed information about request queue operations up to user space. This is @@ -46,6 +48,12 @@ make dest=%{buildroot} prefix=%{buildroot}/%{_prefix} mandir=%{buildroot}/%{_man %{_mandir}/man8/* %changelog +* Thu Feb 6 2020 sunshihao - 1.2.0-11 +- Type:enhancemnet +- ID:NA +- SUG:restart +- DESCi:remove python2 dependency + * Fri Aug 30 2019 zoujing - 1.2.0-10 - Type:enhancemnet - ID:NA -- Gitee From cc312bfe3740b21fb92522634345adbe1bee9913 Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Thu, 6 Feb 2020 13:58:08 +0800 Subject: [PATCH 2/4] remove python2 dependency --- 0000-huawei-remove-python2-dependency.patch | 36 +++++++++++++++++++++ blktrace.spec | 16 ++++++--- 2 files changed, 48 insertions(+), 4 deletions(-) create mode 100644 0000-huawei-remove-python2-dependency.patch diff --git a/0000-huawei-remove-python2-dependency.patch b/0000-huawei-remove-python2-dependency.patch new file mode 100644 index 0000000..4ace0f6 --- /dev/null +++ b/0000-huawei-remove-python2-dependency.patch @@ -0,0 +1,36 @@ +From d8b5a8105a76d390ae9bb197448235dfc663fdac Mon Sep 17 00:00:00 2001 +From: sunshihao +Date: Mon, 3 Feb 2020 17:58:10 +0800 +Subject: [PATCH] blktrace: remove python2 dedpendency + +in order to remove python2 dependency,we +use python3 as Default interpreter. + +Signed-off-by: sunshihao +--- + btt/bno_plot.py | 2 +- + btt/btt_plot.py | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/btt/bno_plot.py b/btt/bno_plot.py +index aa92480..bb0cae7 100644 +--- a/btt/bno_plot.py ++++ b/btt/bno_plot.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # btt blkno plotting interface + # +diff --git a/btt/btt_plot.py b/btt/btt_plot.py +index b81dad5..7e10f92 100755 +--- a/btt/btt_plot.py ++++ b/btt/btt_plot.py +@@ -1,4 +1,4 @@ +-#! /usr/bin/env python ++#! /usr/bin/env python3 + # + # btt_plot.py: Generate matplotlib plots for BTT generate data files + # +-- +1.8.3.1 diff --git a/blktrace.spec b/blktrace.spec index b47e7b5..7e9a7d4 100644 --- a/blktrace.spec +++ b/blktrace.spec @@ -1,17 +1,19 @@ Name: blktrace Version: 1.2.0 -Release: 9 +Release: 11 Summary: Block IO tracer in the Linux kernel License: GPLv2+ Source: http://brick.kernel.dk/snaps/blktrace-%{version}.tar.bz2 URL: http://brick.kernel.dk/snaps -BuildRequires: gcc, git, xz, libaio-devel, python2, librsvg2-devel blktrace sysstat theora-tools +BuildRequires: gcc, git, xz, libaio-devel, python3, librsvg2-devel blktrace sysstat theora-tools Provides: iowatcher Obsoletes: iowatcher -Requires: python2 +Requires: python3 -Patch0: blktrace-fix-btt-overflow.patch +Patch6000: blktrace-fix-btt-overflow.patch + +Patch9000: 0000-huawei-remove-python2-dependency.patch %description blktrace is a block layer IO tracing mechanism which provides detailed @@ -46,6 +48,12 @@ make dest=%{buildroot} prefix=%{buildroot}/%{_prefix} mandir=%{buildroot}/%{_man %{_mandir}/man8/* %changelog +* Thu Feb 6 2020 sunshihao - 1.2.0-11 +- Type:enhancemnet +- ID:NA +- SUG:restart +- DESCi:remove python2 dependency + * Fri Aug 30 2019 zoujing - 1.2.0-10 - Type:enhancemnet - ID:NA -- Gitee From 08f759f059fda7dbf31ac32d7d8e1b71d2622c1f Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Mon, 17 Feb 2020 09:39:40 +0800 Subject: [PATCH 3/4] blktrace remove python2 dependency --- blktrace.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/blktrace.spec b/blktrace.spec index 7e9a7d4..7cf8df9 100644 --- a/blktrace.spec +++ b/blktrace.spec @@ -52,7 +52,7 @@ make dest=%{buildroot} prefix=%{buildroot}/%{_prefix} mandir=%{buildroot}/%{_man - Type:enhancemnet - ID:NA - SUG:restart -- DESCi:remove python2 dependency +- DESCi:blktrace remove python2 dependency * Fri Aug 30 2019 zoujing - 1.2.0-10 - Type:enhancemnet -- Gitee From 85911ef1d233add9fd931635c0f1de09500cd5ac Mon Sep 17 00:00:00 2001 From: eulerstorage Date: Mon, 17 Feb 2020 09:52:49 +0800 Subject: [PATCH 4/4] remove python2 dependency --- blktrace.spec | 4 ++-- ...ython2-dependency.patch => remove-python2-dependency.patch | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename 0000-huawei-remove-python2-dependency.patch => remove-python2-dependency.patch (100%) diff --git a/blktrace.spec b/blktrace.spec index 7cf8df9..eb54abc 100644 --- a/blktrace.spec +++ b/blktrace.spec @@ -11,9 +11,9 @@ Provides: iowatcher Obsoletes: iowatcher Requires: python3 -Patch6000: blktrace-fix-btt-overflow.patch +Patch0: blktrace-fix-btt-overflow.patch -Patch9000: 0000-huawei-remove-python2-dependency.patch +Patch1: remove-python2-dependency.patch %description blktrace is a block layer IO tracing mechanism which provides detailed diff --git a/0000-huawei-remove-python2-dependency.patch b/remove-python2-dependency.patch similarity index 100% rename from 0000-huawei-remove-python2-dependency.patch rename to remove-python2-dependency.patch -- Gitee