- rootfile for iotop is significantly different with python-3.10.8 compared to 3.10.1
Many entries now missing and iotop placed in bin instead of sbin despite source tarball
setup.py having a "dirty hack to make sure iotop is installed in sbin instead of bin"
- Added lines to lfs to move iotop from /bin to /sbin
- Tested iotop out with python-3.10.8 installed vm system and it worked without any
problems, the same as the existing version running with python-3.10.1
Tested-by: Adolf Belka <adolf.belka@ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka@ipfire.org>
---
config/rootfiles/packages/iotop | 12 +-----------
lfs/iotop | 7 ++++++-
2 files changed, 7 insertions(+), 12 deletions(-)
@@ -1,12 +1,2 @@
-usr/lib/python3.10/site-packages/iotop
-#usr/lib/python3.10/site-packages/iotop-0.6-py3.10.egg-info
-#usr/lib/python3.10/site-packages/iotop/__init__.py
-#usr/lib/python3.10/site-packages/iotop/data.py
-#usr/lib/python3.10/site-packages/iotop/genetlink.py
-#usr/lib/python3.10/site-packages/iotop/ioprio.py
-#usr/lib/python3.10/site-packages/iotop/netlink.py
-#usr/lib/python3.10/site-packages/iotop/ui.py
-#usr/lib/python3.10/site-packages/iotop/version.py
-#usr/lib/python3.10/site-packages/iotop/vmstat.py
usr/sbin/iotop
-#usr/share/man/man8/iotop.8
+usr/lib/python3.10/site-packages/iotop-0.6-py3.10.egg
@@ -35,7 +35,7 @@ DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
PROG = iotop
-PAK_VER = 3
+PAK_VER = 4
DEPS =
SERVICES =
@@ -83,5 +83,10 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
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
+
+ # iotop with python-3.10.8 is placing iotop in /usr/bin
+ # move iotop from /usr/bin to /usr/sbin
+ cd $(DIR_APP) && mv -v /usr/bin/iotop /usr/sbin
+
@rm -rf $(DIR_APP)
@$(POSTBUILD)