From 8d4affbfa4653e0c56cf53890fedecb50278eb21 Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 16 Dec 2022 16:04:42 +0100 Subject: [PATCH 1/2] python2-wrapper: remove iotop Update version and remove iotop --- python2-wrapper.be0 | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/python2-wrapper.be0 b/python2-wrapper.be0 index e73c9c691..ff62ea0f2 100755 --- a/python2-wrapper.be0 +++ b/python2-wrapper.be0 @@ -1,6 +1,6 @@ #!/usr/bin/env beesh -# BEE_VERSION python2-wrapper-1.5-0 +# BEE_VERSION python2-wrapper-1.6-0 ## this file was created by bee init and should be executed to build a ## bee-package. (Additional hints are located at the end of this file.) @@ -78,7 +78,6 @@ mee_install() { xml2po \ gnome-doc-tool \ pssh \ - iotop \ python2.7 do create_bin_wrapper $cmd From 29f5afbe4b620cde9443cdb83f931aacf026cf8d Mon Sep 17 00:00:00 2001 From: Donald Buczek Date: Fri, 16 Dec 2022 16:33:26 +0100 Subject: [PATCH 2/2] iotop: Add version 1.22 The Python-based iotop tool is no longer working on Mariux64 so add the C-based iotop standalone tool, which can made to work. A patch for Mariux64 is required, to let iotop work without CONFIG_TASK_DELAY_ACCT. Note, that this package is named iotop-c on some distributions --- iotop.be0 | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) create mode 100755 iotop.be0 diff --git a/iotop.be0 b/iotop.be0 new file mode 100755 index 000000000..b47d9c73b --- /dev/null +++ b/iotop.be0 @@ -0,0 +1,39 @@ +#!/usr/bin/env beesh + +# BEE_VERSION iotop-1.22-0 + +# more info: https://github.com/Tomas-M/iotop + +#SRCURL[0]="https://github.com/Tomas-M/iotop/archive/v${PKGVERSION}/iotop-${PKGVERSION}.tar.gz" +SRCURL[0]="https://beehive.molgen.mpg.de/a8578cd782810c27ccd8bcba1e047ebf/iotop-1.22.tar.gz" + +PATCHURL+=(/src/mariux/patches/iotop-Quickfix-for-Mariux64.patch) + +# build_in_sourcedir + +# sourcesubdir_append src + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +mee_install() { + # The Makefile of iotop 1.22 contains "PREFIX?=$(DESTDIR)/usr" and installs to $(PREFIX)/.. + bee_install PREFIX=$D +} + +#mee_install_post() { +# exit +#}