From mboxrd@z Thu Jan 1 00:00:00 1970
From: Adolf Belka <adolf.belka@ipfire.org>
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
Content-Type: multipart/mixed; boundary="===============5328241160739656529=="
List-Id: <development.lists.ipfire.org>
--===============5328241160739656529==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
- 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 conve=
rted to only
C code with no python. This is being updated on a regular basis with versi=
on 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 simil=
ar look to
the original version. The new version has the ability to scroll all the en=
tries whereas
the original one required the window to be made larger to show more entrie=
s.
- 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 e=
xtras 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 h=
ere with
21 version updates.
Tested-by: Adolf Belka <adolf.belka(a)ipfire.org>
Signed-off-by: Adolf Belka <adolf.belka(a)ipfire.org>
---
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 <info(a)ipfire.org> =
#
+# Copyright (C) 2007-2022 IPFire Team <info(a)ipfire.org> =
#
# =
#
# 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
=20
SUMMARY =3D Top Like UI to Show Per-Process I/O Going on
=20
-VER =3D 0.6
+VER =3D 1.22
=20
THISAPP =3D iotop-$(VER)
-DL_FILE =3D $(THISAPP).tar.gz
+DL_FILE =3D $(THISAPP).tar.xz
DL_FROM =3D $(URL_IPFIRE)
DIR_APP =3D $(DIR_SRC)/$(THISAPP)
TARGET =3D $(DIR_INFO)/$(THISAPP)
=20
PROG =3D iotop
-PAK_VER =3D 4
+PAK_VER =3D 5
DEPS =3D
=20
SERVICES =3D
@@ -48,7 +48,7 @@ objects =3D $(DL_FILE)
=20
$(DL_FILE) =3D $(DL_FROM)/$(DL_FILE)
=20
-$(DL_FILE)_BLAKE2 =3D eb2293f3beb196efafb04f7254a241d5a904cf4bd97673f774dfc0=
db1e77156e49d28c4eda289beb814965fd55acd8adbc2749c1fbb1791a29020255110b2b2f
+$(DL_FILE)_BLAKE2 =3D 59ceff92600f6f9ff080d02ea10a796a2b6f05ccbb663ac2eed9a7=
d5c7f6a44de329307bc45605b3415804ef3b2d0699afdaeb1c22604276ce15fc606304ef70
=20
install : $(TARGET)
=20
@@ -80,13 +80,8 @@ $(subst %,%_BLAKE2,$(objects)) :
=20
$(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-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) && cd $(DIR_SRC) && tar axf $(DIR_DL)/$(DL_FILE)
+ cd $(DIR_APP) && make $(MAKETUNING)
+ cd $(DIR_APP) && make install
@rm -rf $(DIR_APP)
@$(POSTBUILD)
--=20
2.39.0
--===============5328241160739656529==--