summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--testing/atop/APKBUILD6
-rw-r--r--testing/atop/atop-bb-compat.patch30
2 files changed, 34 insertions, 2 deletions
diff --git a/testing/atop/APKBUILD b/testing/atop/APKBUILD
index 74aec10c..ecbfb102 100644
--- a/testing/atop/APKBUILD
+++ b/testing/atop/APKBUILD
@@ -1,7 +1,7 @@
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=atop
pkgver=1.24
-pkgrel=0
+pkgrel=1
pkgdesc="Resource-specific view of processes"
url="http://www.atcomputing.nl/Tools/atop"
license="GPL-2"
@@ -9,14 +9,15 @@ depends=
makedepends="zlib-dev ncurses-dev"
subpackages="$pkgname-doc"
source="http://www.atoptool.nl/packages/atop-$pkgver.tar.gz
+ atop-bb-compat.patch
atop.initd"
_builddir="$srcdir"/$pkgname-$pkgver
prepare() {
cd "$_builddir"
+ patch -p1 -i "$srcdir"/atop-bb-compat.patch || return 1
sed -i -e '/^CFLAGS/s: = -O : += :' \
-e '/^LDFLAGS/s: = : += :' Makefile
- sed -i -e 's:bash:sh:' atop.daily
cp "$srcdir"/atop.initd atop.init
chmod a+rx atop.init
}
@@ -40,4 +41,5 @@ package() {
}
md5sums="46522f7da28460e810e193ab46907af9 atop-1.24.tar.gz
+a4119e314cdc6d50bf027add32e1902b atop-bb-compat.patch
06aba14ddeadbb1d0c3594536785213b atop.initd"
diff --git a/testing/atop/atop-bb-compat.patch b/testing/atop/atop-bb-compat.patch
new file mode 100644
index 00000000..ec46d242
--- /dev/null
+++ b/testing/atop/atop-bb-compat.patch
@@ -0,0 +1,30 @@
+diff --git a/atop.daily b/atop.daily
+index e0d994f..8c0cfc0 100755
+--- a/atop.daily
++++ b/atop.daily
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ CURDAY=`date +%Y%m%d`
+ LOGPATH=/var/log/atop
+ BINPATH=/usr/bin
+@@ -7,11 +7,15 @@ INTERVAL=600 # interval 10 minutes
+
+ # verify if atop still runs for daily logging
+ #
+-if [ -e $PIDFILE ] && ps -p `cat $PIDFILE` | grep 'atop$' > /dev/null
+-then
+- kill -USR1 `cat $PIDFILE` # take final sample
++pid=
++if [ -e $PIDFILE ]; then
++ pid=$(cat $PIDFILE)
++fi
++
++if [ -n "$pid" ] && [ -d /proc/$pid ]; then
++ kill -USR1 $pid # take final sample
+ sleep 3
+- kill -TERM `cat $PIDFILE`
++ kill -TERM $pid
+ rm $PIDFILE
+ sleep 1
+ fi