webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 11:13:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

iotop: Update to work with python3

Browse Source 
- v2 version has updated rootfile. One line was accidentally missed out of
   original patch submission.
- 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@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Adolf Belka
2021-05-10 19:03:08 +02:00
committed by Michael Tremer
parent 724e0b0856
commit aef8d2a708
3 changed files with 24 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lfs/iotop
View File

@@ -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)