mirror of
https://github.com/void-linux/void-packages.git
synced 2025-09-09 13:32:55 +02:00
atop: update to 2.6.0.
This commit is contained in:
parent
74d09526a4
commit
a4ae94b656
4 changed files with 20 additions and 44 deletions
|
@ -1,36 +1,24 @@
|
||||||
diff --git atop.daily atop.daily
|
--- a/atop.daily 2021-10-11 10:06:37.318316573 -0400
|
||||||
index c72214c..ac4b3b7 100755
|
+++ b/atop.daily 2021-10-11 10:10:51.593483875 -0400
|
||||||
--- a/atop.daily
|
@@ -30,13 +30,18 @@
|
||||||
+++ b/atop.daily
|
|
||||||
@@ -1,4 +1,4 @@
|
|
||||||
-#!/bin/bash
|
|
||||||
+#!/bin/sh
|
|
||||||
|
|
||||||
CURDAY=`date +%Y%m%d`
|
|
||||||
LOGPATH=/var/log/atop
|
|
||||||
BINPATH=/usr/bin
|
|
||||||
@@ -7,15 +7,20 @@ INTERVAL=600 # interval 10 minutes
|
|
||||||
|
|
||||||
# verify if atop still runs for daily logging
|
# verify if atop still runs for daily logging
|
||||||
#
|
#
|
||||||
-if [ -e $PIDFILE ] && ps -p `cat $PIDFILE` | grep 'atop$' > /dev/null
|
-if [ -e "$PIDFILE" ] && ps -p `cat "$PIDFILE"` | grep 'atop$' > /dev/null
|
||||||
+pid=
|
+pid=
|
||||||
+if [ -e $PIDFILE ]; then
|
+if [ -e $PIDFILE ]; then
|
||||||
+ pid=$(cat $PIDFILE)
|
+ pid=$(cat $PIDFILE)
|
||||||
+fi
|
+fi
|
||||||
+
|
+
|
||||||
+if [ -n "$pid" ] && [ -d /proc/$pid ]
|
+if [ -n "$pid" ] && [ -d /proc/$pid ]
|
||||||
then
|
then
|
||||||
- kill -USR2 `cat $PIDFILE` # final sample and terminate
|
- kill -USR2 `cat "$PIDFILE"` # final sample and terminate
|
||||||
+ kill -USR2 $pid # final sample and terminate
|
+ kill -USR2 $pid # final sample and terminate
|
||||||
|
|
||||||
CNT=0
|
CNT=0
|
||||||
|
|
||||||
- while ps -p `cat $PIDFILE` > /dev/null
|
- while ps -p `cat "$PIDFILE"` > /dev/null
|
||||||
+ while [ -d /proc/$pid ]
|
+ while [ -d /proc/$pid ]
|
||||||
do
|
do
|
||||||
- let CNT+=1
|
CNT=$((CNT + 1))
|
||||||
+ CNT=$(($CNT + 1))
|
|
||||||
|
|
||||||
if [ $CNT -gt 5 ]
|
|
||||||
then
|
|
||||||
|
|
|
@ -1,11 +0,0 @@
|
||||||
--- a/Makefile 2016-02-26 23:20:11.536799936 +0100
|
|
||||||
+++ b/Makefile 2016-02-26 23:20:19.545799337 +0100
|
|
||||||
@@ -39,7 +39,7 @@ atopacctd: atopacctd.o netlink.o
|
|
||||||
$(CC) atopacctd.o netlink.o -o atopacctd $(LDFLAGS)
|
|
||||||
|
|
||||||
netlink.o: netlink.c
|
|
||||||
- $(CC) -I. -Wall -c netlink.c
|
|
||||||
+ $(CC) -I. -Wall -c netlink.c $(CFLAGS)
|
|
||||||
|
|
||||||
clean:
|
|
||||||
rm -f *.o
|
|
|
@ -1,13 +1,3 @@
|
||||||
--- a/deviate.c
|
|
||||||
+++ b/deviate.c
|
|
||||||
@@ -178,6 +178,7 @@
|
|
||||||
#include <stdio.h>
|
|
||||||
#include <errno.h>
|
|
||||||
#include <fcntl.h>
|
|
||||||
+#include <stdlib.h>
|
|
||||||
#include <unistd.h>
|
|
||||||
#include <limits.h>
|
|
||||||
#include <memory.h>
|
|
||||||
--- a/procdbase.c
|
--- a/procdbase.c
|
||||||
+++ b/procdbase.c
|
+++ b/procdbase.c
|
||||||
@@ -67,7 +67,7 @@
|
@@ -67,7 +67,7 @@
|
||||||
|
@ -19,3 +9,13 @@
|
||||||
|
|
||||||
#include "atop.h"
|
#include "atop.h"
|
||||||
#include "photoproc.h"
|
#include "photoproc.h"
|
||||||
|
--- a/photosyst.c 2021-10-11 10:19:03.436752176 -0400
|
||||||
|
+++ b/photosyst.c 2021-10-11 10:19:17.451816812 -0400
|
||||||
|
@@ -165,6 +165,7 @@
|
||||||
|
#include <dirent.h>
|
||||||
|
#include <sys/ioctl.h>
|
||||||
|
#include <sys/sysmacros.h>
|
||||||
|
+#include <limits.h>
|
||||||
|
|
||||||
|
#define SCALINGMAXCPU 8 // threshold for scaling info per CPU
|
||||||
|
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
# Template file for 'atop'
|
# Template file for 'atop'
|
||||||
pkgname=atop
|
pkgname=atop
|
||||||
version=2.5.0
|
version=2.6.0
|
||||||
revision=1
|
revision=1
|
||||||
build_style=gnu-makefile
|
build_style=gnu-makefile
|
||||||
make_install_target="sysvinstall"
|
make_install_target="sysvinstall"
|
||||||
|
@ -10,8 +10,7 @@ maintainer="Orphaned <orphan@voidlinux.org>"
|
||||||
license="GPL-2.0-or-later"
|
license="GPL-2.0-or-later"
|
||||||
homepage="https://www.atoptool.nl/"
|
homepage="https://www.atoptool.nl/"
|
||||||
distfiles="https://www.atoptool.nl/download/atop-${version}.tar.gz"
|
distfiles="https://www.atoptool.nl/download/atop-${version}.tar.gz"
|
||||||
checksum=4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33
|
checksum=9ec2ca3a571692f7efaa095f99a5106432bcb71cc22cd6c49597ef0481058f72
|
||||||
python_version=2 #unverified
|
|
||||||
|
|
||||||
make_dirs="/var/log/atop 755 root root"
|
make_dirs="/var/log/atop 755 root root"
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue