On 2021-08-13 4:24 p.m., Joe Slater wrote:
bno_plot.py uses gnuplot. Also change shebangs to
python3 because we do not support python2.
We need to get agreement about what 'python' is.
That's not something i follow and it's already late on Friday so
I'm CCing Trevor, Mr meta-python and pointing you to:
https://www.python.org/dev/peps/pep-0394/
which from a brief review seems to say that it's up to the
distribution! Fun!!
My preference without knowing what other distros have done
is to have the build system make a soft link:
python -> python3
Signed-off-by: Joe Slater <[email protected]>
---
meta/recipes-kernel/blktrace/blktrace_git.bb | 6 +++-
.../blktrace/files/python3-shebangs.patch | 30 +++++++++++++++++++
2 files changed, 35 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..36ce282481 100644
--- a/meta/recipes-kernel/blktrace/blktrace_git.bb
+++ b/meta/recipes-kernel/blktrace/blktrace_git.bb
@@ -10,11 +10,15 @@ LIC_FILES_CHKSUM =
"file://COPYING;md5=393a5ca445f6965873eca0259a17f833"
DEPENDS = "libaio"
+RDEPENDS:${PN} += "gnuplot"
As the DESCRIPTION says:
There are three major components:
a kernel component,
a utility to record the i/o trace information for
the kernel to user space,
and
utilities to analyse and view the trace information.
so shouldn't we split the userspace part up so that the utilities are
packaged separately and people who want to collect data on
target and analyze it elsewhere don't pull in gnuplot and maybe more?
../Randy
+
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 <[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
+ #
--
# Randy MacLeod
# Wind River Linux
-=-=-=-=-=-=-=-=-=-=-=-
Links: You receive all messages sent to this group.
View/Reply Online (#154787):
https://lists.openembedded.org/g/openembedded-core/message/154787
Mute This Topic: https://lists.openembedded.org/mt/84872571/21656
Group Owner: [email protected]
Unsubscribe: https://lists.openembedded.org/g/openembedded-core/unsub
[[email protected]]
-=-=-=-=-=-=-=-=-=-=-=-
