From patchwork Tue Dec 27 17:13:50 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adolf Belka X-Patchwork-Id: 6349 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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by web04.haj.ipfire.org (Postfix) with ESMTPS id 4NhLpt1MLMz3wcv for ; Tue, 27 Dec 2022 17:13:58 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail02.haj.ipfire.org", Issuer "R3" (verified OK)) by mail01.ipfire.org (Postfix) with ESMTPS id 4NhLpr1PMyzch; Tue, 27 Dec 2022 17:13:56 +0000 (UTC) Received: from mail02.haj.ipfire.org (localhost [127.0.0.1]) by mail02.haj.ipfire.org (Postfix) with ESMTP id 4NhLpq6Rckz2y4g; Tue, 27 Dec 2022 17:13:55 +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) server-digest SHA384 client-signature ECDSA (P-384) client-digest SHA384) (Client CN "mail01.haj.ipfire.org", Issuer "R3" (verified OK)) by mail02.haj.ipfire.org (Postfix) with ESMTPS id 4NhLpp4C2cz2xDp for ; Tue, 27 Dec 2022 17:13:54 +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 4NhLpn4dfXzL7; Tue, 27 Dec 2022 17:13:53 +0000 (UTC) DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003ed25519; t=1672161233; 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; bh=3EsNOZG93sx2q0rmYSNfGnEbrBarTBNNdvWFBptTb6c=; b=1grhYp64zHKVdUWR2gfplncIAnyS7hlCcG8rpNjmlctIXP6bn27L4hlOb6IDwctCroa9eF BI3P440qDu2+q1BA== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ipfire.org; s=202003rsa; t=1672161233; 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; bh=3EsNOZG93sx2q0rmYSNfGnEbrBarTBNNdvWFBptTb6c=; b=jrXmHt2whspajII37AakgsRQjFZU6lsOSEW3ze7QMqkAYk3HlVtGiAZIvJAxU+TRl3dJ+Q p9R8cBNlruNg0x+qLmPAHdyZySGkRQIe2Fzs3bmRUKlm42Ruj1a4mwRxdboekXzkxIehLz dTLsSNnWog6e2jWeinATuhVhBPi234ecbctoYEEcyNV1KXIIeEEVU1p8bVIQB9vVVv1b2E t7mNCWebffBfhd+EfjGC4IIHgWUsvXzAuPBMBgMrbwXDCVKnWaLdtPtNT5gABd4Wo1YCt2 Kw5naQgu13D8QR/Frvif3GWnDRNZH6wVDPHXu5p0zi31oGgB9ng0un8ZyyySvA== From: Adolf Belka To: development@lists.ipfire.org Subject: [PATCH] iotop: Update to version 1.22 coming from new repository Date: Tue, 27 Dec 2022 18:13:50 +0100 Message-Id: <20221227171350.3559545-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" - Existing iotop is version 0.6 from 2013. In that original repository there have been 42 commits since then up to 2022-03-07 but without any version release. - In 2020 a new repository was started, based on the original iotop but converted to only C code with no python. This is being updated on a regular basis with version releases. This version was released in July 10th 2022. There have been n21 releases since this repository was started. - Built and tested this version of iotop and it gave a screen with very similar look to the original version. The new version has the ability to scroll all the entries whereas the original one required the window to be made larger to show more entries. - The new version also has a column showing a graphical view of the amount of traffic as well as the actual numbers. - Overall this looks to match what vthe original iotop did, plus with a few extras and is being regularly maintained with new releases. - Updated rootfile - This version of iotop is automatically placed in /usr/sbin as the original used to be. - New repository is at https://github.com/Tomas-M/iotop - Changelog can be seen at the above repository. It is too large to include here with 21 version updates. Tested-by: Adolf Belka Signed-off-by: Adolf Belka --- config/rootfiles/packages/iotop | 2 +- lfs/iotop | 21 ++++++++------------- 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/config/rootfiles/packages/iotop b/config/rootfiles/packages/iotop index 356541e22..bd751347a 100644 --- a/config/rootfiles/packages/iotop +++ b/config/rootfiles/packages/iotop @@ -1,2 +1,2 @@ usr/sbin/iotop -usr/lib/python3.10/site-packages/iotop-0.6-py3.10.egg +#usr/share/man/man8/iotop.8 diff --git a/lfs/iotop b/lfs/iotop index dd9deb2e4..1dc44eaef 100644 --- a/lfs/iotop +++ b/lfs/iotop @@ -1,7 +1,7 @@ ############################################################################### # # # IPFire.org - A linux based firewall # -# Copyright (C) 2007-2018 IPFire Team # +# Copyright (C) 2007-2022 IPFire Team # # # # This program is free software: you can redistribute it and/or modify # # it under the terms of the GNU General Public License as published by # @@ -26,16 +26,16 @@ include Config SUMMARY = Top Like UI to Show Per-Process I/O Going on -VER = 0.6 +VER = 1.22 THISAPP = iotop-$(VER) -DL_FILE = $(THISAPP).tar.gz +DL_FILE = $(THISAPP).tar.xz DL_FROM = $(URL_IPFIRE) DIR_APP = $(DIR_SRC)/$(THISAPP) TARGET = $(DIR_INFO)/$(THISAPP) PROG = iotop -PAK_VER = 4 +PAK_VER = 5 DEPS = SERVICES = @@ -48,7 +48,7 @@ objects = $(DL_FILE) $(DL_FILE) = $(DL_FROM)/$(DL_FILE) -$(DL_FILE)_BLAKE2 = eb2293f3beb196efafb04f7254a241d5a904cf4bd97673f774dfc0db1e77156e49d28c4eda289beb814965fd55acd8adbc2749c1fbb1791a29020255110b2b2f +$(DL_FILE)_BLAKE2 = 59ceff92600f6f9ff080d02ea10a796a2b6f05ccbb663ac2eed9a7d5c7f6a44de329307bc45605b3415804ef3b2d0699afdaeb1c22604276ce15fc606304ef70 install : $(TARGET) @@ -80,13 +80,8 @@ $(subst %,%_BLAKE2,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) - @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) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE) + cd $(DIR_APP) && make $(MAKETUNING) + cd $(DIR_APP) && make install @rm -rf $(DIR_APP) @$(POSTBUILD)