From adabe4d46e698138f26487c548f401195f429092 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 13 Feb 2019 16:08:09 +0100 Subject: [PATCH 1/4] atop: Add version 2.4.0 [Description](https://www.atoptool.nl/index.php): > Atop is an ASCII full-screen performance monitor for Linux that is > capable of reporting the activity of all processes (even if processes > have finished during the interval), daily logging of system and process > activity for long-term analysis, highlighting overloaded system > resources by using colors, etc. At regular intervals, it shows > system-level activity related to the CPU, memory, swap, disks (including > LVM) and network layers, and for every process (and thread) it shows > e.g. the CPU utilization, memory growth, disk utilization, priority, > username, state, and exit code. > > In combination with the optional kernel module netatop, it even shows > network activity per process/thread. --- atop-2.4.0-0.bee | 77 ++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 77 insertions(+) create mode 100755 atop-2.4.0-0.bee diff --git a/atop-2.4.0-0.bee b/atop-2.4.0-0.bee new file mode 100755 index 000000000..273ba8221 --- /dev/null +++ b/atop-2.4.0-0.bee @@ -0,0 +1,77 @@ +#!/usr/bin/env beesh + +## 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.) + +############################################################################### +## The source URL(s) define the location of the sources that will be +## downloaded. Version variables may be used to simplify reuse of this bee-file. + +SRCURL[0]="https://www.atoptool.nl/download/atop-${PKGVERSION}.tar.gz" + +############################################################################### +## Add URLs/pathes to patch files to the PATCHURL array. +## The sources will be patched in the order of the array. + +# PATCHURL+=() + +############################################################################### +## Uncomment the next statement, if the software may not be able to be built +## outside the source directory and needs to be built inside the source +## directory. + +# build_in_sourcedir + +############################################################################### +## bee cannot detect buildtypes specified in subdirectories. +## Sometimes packages "hide" the real sources in a subdirectory named +## 'src' or 'cmake' or .. +## use 'sourcesubdir_append' to specify this directory if known. + +# sourcesubdir_append src + + +############################################################################### +## Change the default (auto-detected) steps to +## extract, patch, configure/setup, build and install the software. +## Make sure the mee_install function does install everything to the +## image directory "${D}" + +#mee_extract() { +# bee_extract "${@}" +#} + +#mee_patch() { +# bee_patch "${@}" +#} + +#mee_configure() { +# bee_configure +#} + +#mee_build() { +# bee_build +#} + +#mee_install() { +# bee_install +#} +## by default this may be 'make install DESTDIR="${D}"' + +############################################################################### +## +## Additional hints: +## +## The name of this bee-file should follow the following naming convention: +## pkgname-pkgversion-pkgrevision.bee +## +## You may remove all comments as long as SRCURL[0] is set. +## +## Everything in this file will be executed in a bash environment. +## +## Build the package by executing +## './pkg-version-N.bee' or +## 'beesh ./pkg-version-N.bee' +## +## see http://beezinga.org/ +## From 2b568f378af1e4b62f1a4c017bbd624cb28785d5 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 13 Feb 2019 16:10:38 +0100 Subject: [PATCH 2/4] atop: Convert to versionless bee file --- atop-2.4.0-0.bee => atop.be0 | 2 ++ 1 file changed, 2 insertions(+) rename atop-2.4.0-0.bee => atop.be0 (98%) diff --git a/atop-2.4.0-0.bee b/atop.be0 similarity index 98% rename from atop-2.4.0-0.bee rename to atop.be0 index 273ba8221..367397a0e 100755 --- a/atop-2.4.0-0.bee +++ b/atop.be0 @@ -1,5 +1,7 @@ #!/usr/bin/env beesh +# BEE_VERSION atop-2.4.0-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.) From c9a13c1525ac4581f16cacc2ccc69b82e2605950 Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 13 Feb 2019 16:15:32 +0100 Subject: [PATCH 3/4] atop: Use `make systemdinstall` Fix the error below: [BEE] => entering bee_install() .. [BEE] make -j120 install PREFIX=/usr EPREFIX=/usr BINDIR=/usr/bin SBINDIR=/usr/sbin LIBEXECDIR=/usr/libexec SYSCONFDIR=/etc SHAREDSTATEDIR=/var LOCALSTATEDIR=/var LIBDIR=/usr/lib INCLUDEDIR= /usr/include DATAROOTDIR=/usr/share DATADIR=/usr/share INFODIR=/usr/share/info LOCALEDIR=/usr/share/locale MANDIR=/usr/share/man DOCDIR=/usr/share/doc/atop DESTDIR=/dev/shm/bee-root/atop/ato p-2.4.0-0/image Choose either 'make systemdinstall' or 'make sysvinstall' [BEE] <= leaving bee_install() .. --- atop.be0 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/atop.be0 b/atop.be0 index 367397a0e..2e5b35b2f 100755 --- a/atop.be0 +++ b/atop.be0 @@ -55,9 +55,9 @@ SRCURL[0]="https://www.atoptool.nl/download/atop-${PKGVERSION}.tar.gz" # bee_build #} -#mee_install() { -# bee_install -#} +mee_install() { + start_cmd make systemdinstall DESTDIR="${D}" +} ## by default this may be 'make install DESTDIR="${D}"' ############################################################################### From 0b595364f833b0926d9d9c9969b7087ae70947df Mon Sep 17 00:00:00 2001 From: Paul Menzel Date: Wed, 13 Feb 2019 16:20:37 +0100 Subject: [PATCH 4/4] atop: Remove cron job doing `systemctl restart atop` at midnight --- atop.be0 | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/atop.be0 b/atop.be0 index 2e5b35b2f..b1552cd1b 100755 --- a/atop.be0 +++ b/atop.be0 @@ -60,6 +60,11 @@ mee_install() { } ## by default this may be 'make install DESTDIR="${D}"' +mee_install_post() { + rm -v ${D}/etc/cron.d/atop + rmdir ${D}/etc/cron.d/ +} + ############################################################################### ## ## Additional hints: