blktrace: change shebangs
PATCH 1/1 blktrace: change shebangs
Change shebangs to python3 because we do not support python2.
--- meta/recipes-kernel/blktrace/blktrace_git.bb | 4 ++- .../blktrace/files/python3-shebangs.patch | 30 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 meta/recipes-kernel/blktrace/files/python3-shebangs.patch
meta/recipes-kernel/blktrace/blktrace_git.bb +3 -1
@@ -14,7 +14,9 @@ SRCREV = "366d30b9cdb20345c5d064af850d686da79b89eb" PV = "1.3.0+git${SRCPV}" -SRC_URI = "git://git.kernel.dk/blktrace.git" +SRC_URI = "git://git.kernel.dk/blktrace.git \ + file://python3-shebangs.patch \ + " S = "${WORKDIR}/git"
meta/recipes-kernel/blktrace/files/python3-shebangs.patch new file +30 -0
@@ -0,0 +1,30 @@ +blktrace: Use python3 shebangs + +blktrace can use either python2 or python3, but we really want +python3, so modify the shebangs. + +Upstream-Status: pending + +Signed-off-by: Joe Slater <[email protected]. + + +diff --git a/btt/bno_plot.py b/btt/bno_plot.py +index 3aa4e19..d7d7159 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 40bc71f..8620d31 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 + #
Signature · 1 line
2.25.1
meta/recipes-kernel/blktrace/files/python3-shebangs.patch line 8
Quoted 7 lines · Joe Slater
meta/recipes-kernel/blktrace/files/python3-shebangs.patch new file +6
-0+blktrace can use either python2 or python3, but we really want +python3, so modify the shebangs. + +Upstream-Status: pending + +Signed-off-by: Joe Slater <[email protected].
Please submit upstream first. Signed-off-by is incorrectly written, needs to be added by git preferably. 'Pending' needs to be capitalized (but please submit upstream first).
Alex
Quoted 13 lines · Alexander Kanavin
meta/recipes-kernel/blktrace/files/python3-shebangs.patch line 8
Quoted 7 lines · Joe Slater
meta/recipes-kernel/blktrace/files/python3-shebangs.patch new file +6
-0+blktrace can use either python2 or python3, but we really want +python3, so modify the shebangs. + +Upstream-Status: pending + +Signed-off-by: Joe Slater <[email protected].Please submit upstream first. Signed-off-by is incorrectly written, needs to be added by git preferably. 'Pending' needs to be capitalized (but please submit upstream first).
I very much doubt upstream will want to change "python" -> "python3" as it is a distro thing. It is frustrating it isn't configurable. I think in most other cases we sed this into scripts but that has pros and cons too rather than a patch we have to carry...
Cheers,
Richard
When I previously checked upstream, they explicitly left the "python" when they converted the scripts to work with python3 because the scripts work with 2 or 3.
Joe
Quoted 32 lines
-----Original Message-----
From: Richard Purdie <[email protected]>
Sent: Monday, August 16, 2021 2:59 PM
To: Alexander Kanavin <[email protected]>; Slater, Joseph <[email protected]>
Cc: OE-core <[email protected]>; MacLeod, Randy <[email protected]>
Subject: Re: [oe-core][PATCH 1/1] blktrace: change shebangsQuoted 13 lines · Alexander Kanavin
meta/recipes-kernel/blktrace/files/python3-shebangs.patch line 8
Quoted 7 lines · Joe Slater
meta/recipes-kernel/blktrace/files/python3-shebangs.patch new file +6
-0+blktrace can use either python2 or python3, but we really want +python3, so modify the shebangs. + +Upstream-Status: pending + +Signed-off-by: Joe Slater <[email protected].Please submit upstream first. Signed-off-by is incorrectly written, needs to be added by git preferably. 'Pending' needs to be capitalized (but please submit upstream first).
I very much doubt upstream will want to change "python" -> "python3" as it is a distro thing. It is frustrating it isn't configurable. I think in most other cases we sed this into scripts but that has pros and cons too rather than a patch we have to carry...
Cheers,
Richard