From mboxrd@z Thu Jan 1 00:00:00 1970 From: Adolf Belka <adolf.belka@ipfire.org> To: development@lists.ipfire.org Subject: [PATCH 48/48] iotop: Modified rootfile with python-3.10.8 Date: Wed, 09 Nov 2022 19:57:34 +0100 Message-ID: <20221109185734.3920-48-adolf.belka@ipfire.org> In-Reply-To: <20221109185734.3920-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============6277872015868477771==" List-Id: <development.lists.ipfire.org> --===============6277872015868477771== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable - rootfile for iotop is significantly different with python-3.10.8 compared t= o 3.10.1 Many entries now missing and iotop placed in bin instead of sbin despite s= ource tarball setup.py having a "dirty hack to make sure iotop is installed in sbin inst= ead 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 witho= ut any problems, the same as the existing version running with python-3.10.1 Tested-by: Adolf Belka <adolf.belka(a)ipfire.org> Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org> --- config/rootfiles/packages/iotop | 12 +----------- lfs/iotop | 7 ++++++- 2 files changed, 7 insertions(+), 12 deletions(-) diff --git a/config/rootfiles/packages/iotop b/config/rootfiles/packages/iotop index c2a2813a7..356541e22 100644 --- a/config/rootfiles/packages/iotop +++ b/config/rootfiles/packages/iotop @@ -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 diff --git a/lfs/iotop b/lfs/iotop index 8c01ae51d..dd9deb2e4 100644 --- a/lfs/iotop +++ b/lfs/iotop @@ -35,7 +35,7 @@ DIR_APP =3D $(DIR_SRC)/$(THISAPP) TARGET =3D $(DIR_INFO)/$(THISAPP) =20 PROG =3D iotop -PAK_VER =3D 3 +PAK_VER =3D 4 DEPS =3D =20 SERVICES =3D @@ -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-iter= values-with-values-in-setup.py.patch cd $(DIR_APP) && python3 setup.py install +=09 + # 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 +=09 @rm -rf $(DIR_APP) @$(POSTBUILD) --=20 2.38.1 --===============6277872015868477771==--