From patchwork Wed Nov 9 18:57:34 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6126 Return-Path: Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4N6vQF71dgz3xkh for ; Wed, 9 Nov 2022 18:59:01 +0000 (UTC) Received: from mail02.haj.ipfire.org (mail02.haj.ipfire.org [172.28.1.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4N6vPf62jRz2gB; Wed, 9 Nov 2022 18:58:30 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4N6vPf5nbvz2yxs; Wed, 9 Nov 2022 18:58:30 +0000 (UTC) Received: from mail01.ipfire.org (mail01.haj.ipfire.org [172.28.1.202]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) client-signature ECDSA (P-384)) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4N6vPb2vMbz2xKs for ; Wed, 9 Nov 2022 18:58:27 +0000 (UTC) Received: from [127.0.0.1] (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by mail01.ipfire.org (Postfix) with ESMTPSA id 4N6vPX1kPdz2wC; Wed, 9 Nov 2022 18:58:24 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1668020304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ur1BsJS5BE7mWwFDEKP5PLOORLICepy5iCfcspvLA+E=; b=U9vvtIsIewKnnNxo0xemtRwcwu+BLSnnZBBCibe1uT5gNc3AtL+yP8yuG0SzSGufJU01qI oqkEZnlk2ggyr9DQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1668020304; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=Ur1BsJS5BE7mWwFDEKP5PLOORLICepy5iCfcspvLA+E=; b=Ny129oJK+C71Pt/21OJGO/jww95Rl4UfueeydnXf0Pzqj7cJMoWez1H3fvx2T6GHKjKTGi WW7Mr/NVQga1z+KmViv9WWxVh8g7NhrqFTs6ARgHqMTu9ZrcpamJE3ZrGzCJrm5H2T2BjU QPB4E09MnRD/c7wGec+Ht+hSxKxh1ViiVNNFWxUjfFuMKMHnzbb4UV2PFuiaMPychNTLXG KArM8WylW7UdgerjT9BYFzfLlrPYBWDNGQhFHEkEyvABPDmSfRQdWn/rluzx8PFmjLTu8K yTqGQtALE2+Moj+Nl9vJYX8sTKa1qNalWUqevK1BsJCH2uWJMhYXV0f64m9lRA== From: Adolf Belka 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 X-BeenThere: development@lists.ipfire.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: IPFire development talk List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: development-bounces@lists.ipfire.org Sender: "Development" - 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 Signed-off-by: Adolf Belka --- 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 = $(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)