[oe-core][PATCH 1/1] blktrace: change shebangs

[oe-core][PATCH 1/1] blktrace: change shebangs

[Joe Slater]

Change shebangs to python3 because we do not support python2.

Signed-off-by: Joe Slater <joe.slater@windriver.com>
---
 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

diff --git a/meta/recipes-kernel/blktrace/blktrace_git.bb b/meta/recipes-kernel/blktrace/blktrace_git.bb
index d00b1bd0be..2f2695cef0 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -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"
 
diff --git a/meta/recipes-kernel/blktrace/files/python3-shebangs.patch b/meta/recipes-kernel/blktrace/files/python3-shebangs.patch
new file mode 100644
index 0000000000..70a35c2c3a
--- /dev/null
+++ b/meta/recipes-kernel/blktrace/files/python3-shebangs.patch
@@ -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 <joe.slater@windriver.com.
+
+
+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
+ #
-- 
2.25.1

Re: [oe-core][PATCH 1/1] blktrace: change shebangs

[Alexander Kanavin]

[-- Attachment #1: Type: text/plain, Size: 469 bytes --]

On Mon, 16 Aug 2021 at 20:20, Joe Slater <joe.slater@windriver.com> wrote:

> +blktrace can use either python2 or python3, but we really want
> +python3, so modify the shebangs.
> +
> +Upstream-Status: pending
> +
> +Signed-off-by: Joe Slater <joe.slater@windriver.com.
>

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

[-- Attachment #2: Type: text/html, Size: 892 bytes --]

Re: [oe-core][PATCH 1/1] blktrace: change shebangs

[Richard Purdie]

On Mon, 2021-08-16 at 20:40 +0200, Alexander Kanavin wrote:
> On Mon, 16 Aug 2021 at 20:20, Joe Slater <joe.slater@windriver.com> wrote:
> > +blktrace can use either python2 or python3, but we really want
> > +python3, so modify the shebangs.
> > +
> > +Upstream-Status: pending
> > +
> > +Signed-off-by: Joe Slater <joe.slater@windriver.com.
> > 
> 
> 
> 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

Re: [oe-core][PATCH 1/1] blktrace: change shebangs

[Joe Slater]

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

> -----Original Message-----
> From: Richard Purdie <richard.purdie@linuxfoundation.org>
> Sent: Monday, August 16, 2021 2:59 PM
> To: Alexander Kanavin <alex.kanavin@gmail.com>; Slater, Joseph
> <joe.slater@windriver.com>
> Cc: OE-core <openembedded-core@lists.openembedded.org>; MacLeod, Randy
> <Randy.MacLeod@windriver.com>
> Subject: Re: [oe-core][PATCH 1/1] blktrace: change shebangs
> 
> On Mon, 2021-08-16 at 20:40 +0200, Alexander Kanavin wrote:
> > On Mon, 16 Aug 2021 at 20:20, Joe Slater <joe.slater@windriver.com> wrote:
> > > +blktrace can use either python2 or python3, but we really want
> > > +python3, so modify the shebangs.
> > > +
> > > +Upstream-Status: pending
> > > +
> > > +Signed-off-by: Joe Slater <joe.slater@windriver.com.
> > >
> >
> >
> > 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