From: Adolf Belka <adolf.belka@ipfire.org>
To: development@lists.ipfire.org
Subject: [PATCH] iotop: Update to work with python3
Date: Sun, 09 May 2021 15:36:06 +0200 [thread overview]
Message-ID: <20210509133606.3525716-1-adolf.belka@ipfire.org> (raw)
[-- Attachment #1: Type: text/plain, Size: 4204 bytes --]
- Change from building with python2 to python3
- iotop setup.py used "itervalues" which is no longer used by python3
In python3 this has been changed to "values". Patch created to update
this in the source tarball setup.py
- Update lfs file with patch application and use of python3
- Update of rootfile
- Installed updated version into vm testbed and iotop confirmed working
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
config/rootfiles/packages/iotop | 29 +++++++------------
lfs/iotop | 5 ++--
...e-itervalues-with-values-in-setup.py.patch | 11 +++++++
3 files changed, 24 insertions(+), 21 deletions(-)
create mode 100644 src/patches/iotop-0.6-replace-itervalues-with-values-in-setup.py.patch
diff --git a/config/rootfiles/packages/iotop b/config/rootfiles/packages/iotop
index 5ebe221ef..4a60e2cef 100644
--- a/config/rootfiles/packages/iotop
+++ b/config/rootfiles/packages/iotop
@@ -1,20 +1,11 @@
-usr/lib/python2.7/site-packages/iotop
-#usr/lib/python2.7/site-packages/iotop-0.6-py2.7.egg-info
-#usr/lib/python2.7/site-packages/iotop/__init__.py
-#usr/lib/python2.7/site-packages/iotop/__init__.pyc
-#usr/lib/python2.7/site-packages/iotop/data.py
-#usr/lib/python2.7/site-packages/iotop/data.pyc
-#usr/lib/python2.7/site-packages/iotop/genetlink.py
-#usr/lib/python2.7/site-packages/iotop/genetlink.pyc
-#usr/lib/python2.7/site-packages/iotop/ioprio.py
-#usr/lib/python2.7/site-packages/iotop/ioprio.pyc
-#usr/lib/python2.7/site-packages/iotop/netlink.py
-#usr/lib/python2.7/site-packages/iotop/netlink.pyc
-#usr/lib/python2.7/site-packages/iotop/ui.py
-#usr/lib/python2.7/site-packages/iotop/ui.pyc
-#usr/lib/python2.7/site-packages/iotop/version.py
-#usr/lib/python2.7/site-packages/iotop/version.pyc
-#usr/lib/python2.7/site-packages/iotop/vmstat.py
-#usr/lib/python2.7/site-packages/iotop/vmstat.pyc
+usr/lib/python3.8/site-packages/iotop
+#usr/lib/python3.8/site-packages/iotop-0.6-py3.8.egg-info
+#usr/lib/python3.8/site-packages/iotop/__init__.py
+#usr/lib/python3.8/site-packages/iotop/data.py
+#usr/lib/python3.8/site-packages/iotop/genetlink.py
+#usr/lib/python3.8/site-packages/iotop/ioprio.py
+#usr/lib/python3.8/site-packages/iotop/netlink.py
+#usr/lib/python3.8/site-packages/iotop/ui.py
+#usr/lib/python3.8/site-packages/iotop/version.py
+#usr/lib/python3.8/site-packages/iotop/vmstat.py
usr/sbin/iotop
-#usr/share/man/man8/iotop.8
diff --git a/lfs/iotop b/lfs/iotop
index d286eb1a9..02f027e5c 100644
--- a/lfs/iotop
+++ b/lfs/iotop
@@ -33,7 +33,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = iotop
-PAK_VER = 1
+PAK_VER = 2
DEPS =
###############################################################################
@@ -77,6 +77,7 @@ $(subst %,%_MD5,$(objects)) :
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && python setup.py install
+ cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/iotop-0.6-replace-itervalues-with-values-in-setup.py.patch
+ cd $(DIR_APP) && python3 setup.py install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
diff --git a/src/patches/iotop-0.6-replace-itervalues-with-values-in-setup.py.patch b/src/patches/iotop-0.6-replace-itervalues-with-values-in-setup.py.patch
new file mode 100644
index 000000000..9778d19d1
--- /dev/null
+++ b/src/patches/iotop-0.6-replace-itervalues-with-values-in-setup.py.patch
@@ -0,0 +1,11 @@
+--- iotop-0.6/setup.py.orig 2013-05-27 00:44:18.000000000 +0200
++++ iotop-0.6/setup.py 2021-05-08 23:20:44.340837716 +0200
+@@ -7,7 +7,7 @@
+ # Dirty hack to make setup.py install the iotop script to sbin/ instead of bin/
+ # while still honoring the choice of installing into local/ or not.
+ if hasattr(distutils_install, 'INSTALL_SCHEMES'):
+- for d in distutils_install.INSTALL_SCHEMES.itervalues():
++ for d in distutils_install.INSTALL_SCHEMES.values():
+ if d.get('scripts', '').endswith('/bin'):
+ d['scripts'] = d['scripts'][:-len('/bin')] + '/sbin'
+
--
2.31.1
reply other threads:[~2021-05-09 13:36 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210509133606.3525716-1-adolf.belka@ipfire.org \
--to=adolf.belka@ipfire.org \
--cc=development@lists.ipfire.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox