diff mbox series

[48/48] iotop: Modified rootfile with python-3.10.8

Message ID	20221109185734.3920-48-adolf.belka@ipfire.org
State	Accepted
Commit	f6afaf5625564b06f04a09b8f863f1f04609a59e
Headers	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, 9 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> References: <20221109185734.3920-1-adolf.belka@ipfire.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: development-bounces@lists.ipfire.org Sender: "Development" <development-bounces@lists.ipfire.org>
Series	[01/48] python3: Update to version 3.10.8 \| [01/48] python3: Update to version 3.10.8 [02/48] make.sh: Addition, deletion and re-orderiong of packages for Python-3.10.8 [03/48] python3-Cython: Removal of this module from IPFire [04/48] python3-build: Update to version 0.8.0 and to work with python-3.10.8 [05/48] python3-daemon: Update to version 2.3.1 and to work with python-3.10.8 [06/48] python3-pep517:Update to version 0.13.0 and to work with python-3.10.8 [07/48] python3-setuptools-rust:Update to version 1.5.2 and to work with python-3.10.8 [08/48] python3-setuptools-scm:Update to version 7.0.5 and to work with python-3.10.8 [09/48] python3-cryptography:Update to version 38.0.1 and to work with python-3.10.8 [10/48] rust-chrono:Update to version 0.4.22 required by python3-cryptography [11/48] rust-iana-time-zone: Required by updated rust-chrono [12/48] rust-asn1: Update to version 0.12.2 - required by python3-cryptography [13/48] rust-asn1_derive:Update to version 0.12.2 - required by python3-cryptography [14/48] rust-ouroboros:Update to version 0.15.5 - required by python3-cryptography [15/48] rust-ouroboros_macro:Update to version 0.15.5 - required by python3-cryptography [16/48] rust-pem:Update to version 1.1.0 - required by python3-cryptography [17/48] rust-pyo3:Update to version 0.15.2 - required by python3-cryptography [18/48] rust-pyo3-macros:Update to version 0.15.2 - required by python3-cryptography [19/48] rust-pyo3-macros-backend:Update to version 0.15.2 - required by python3-cryptography [20/48] rust-pyo3-build-config:Update to version 0.15.2 - required by python3-cryptography [21/48] python3-arrow:Update to version 1.2.3 and to work with python-3.10.8 [22/48] python3-attrs:Update to version 22.1.0 and to work with python-3.10.8 [23/48] python3-botocore:Update to version 1.27.89 and to work with python-3.10.8 [24/48] python3-certifi:Update to version 2022.9.4 and to work with python-3.10.8 [25/48] python3-cffi:Update to version 1.15.1 and to work with python-3.10.8 [26/48] python3-charset-normalizer:Update to version 2.1.1 and to work with python-3.10.8 [27/48] python3-circuitbreaker:Update to version 1.4.0 and to work with python-3.10.8 [28/48] python3-click:Update to version 8.1.3 and to work with python-3.10.8 [29/48] python3-colorama:Update to version 0.4.5 and to work with python-3.10.8 [30/48] python3-docutils:Update to version 0.19 and to work with python-3.10.8 [31/48] python3-idna:Update to version 3.4 and to work with python-3.10.8 [32/48] python3-jmespath:Update to version 1.0.1 and to work with python-3.10.8 [33/48] python3-msgpack:Update to version 1.0.4 and to work with python-3.10.8 [34/48] python3-pyfuse3:Update to version 3.2.2 and to work with python-3.10.8 [35/48] python3-pyparsing:Update to version 3.0.9 and to work with python-3.10.8 [36/48] python3-pytz:Update to version 2022.4 and to work with python-3.10.8 [37/48] python3-requests:Update to version 2.28.1 and to work with python-3.10.8 [38/48] python3-rsa:Update to version 4.9 and to work with python-3.10.8 [39/48] python3-s3transfer:Update to version 0.6.0 and to work with python-3.10.8 [40/48] python3-semantic_version:Update to version 2.10.0 and to work with python-3.10.8 [41/48] python3-setuptools:Update to version 65.4.1 and to work with python-3.10.8 [42/48] python3-sniffio:Update to version 1.3.0 and to work with python-3.10.8 [43/48] python3-trio:Update to version 0.22.0 and to work with python-3.10.8 [44/48] python3-typing_extensions:Update to version 4.4.0 and to work with python-3.10.8 [45/48] python3-urllib3:Update to version 1.26.12 and to work with python-3.10.8 [46/48] python3-flit:Modify lfs to work with python-3.10.8 [47/48] libplist: Update rootfile for operation with python-3.10.8 [48/48] iotop: Modified rootfile with python-3.10.8

Commit Message

Adolf Belka Nov. 9, 2022, 6:57 p.m. UTC

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

diff mbox series

Patch

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    = $(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)