Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

atop: update to 2.6.0

Browse source 
Reordered some stuff in the Makefile for consistency between packages.

Refreshed patches.

Added a musl fix.

Signed-off-by: Rosen Penev <rosenp@gmail.com>
This commit is contained in:
Rosen Penev 2021-01-19 15:21:30 -08:00
parent 515c780da3
commit 699ccdd12f
No known key found for this signature in database
GPG key ID: 36D31CFA845F0E3B
3 changed files with 21 additions and 21 deletions

11
admin/atop/Makefile
View file

@ -7,13 +7,15 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=atop PKG_NAME:=atop
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_VERSION:=2.5.0 PKG_VERSION:=2.6.0
PKG_LICENSE:=GPL-2.0-or-later
PKG_SOURCE_URL:=https://www.atoptool.nl/download/
PKG_HASH:=4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=https://www.atoptool.nl/download/
PKG_HASH:=9ec2ca3a571692f7efaa095f99a5106432bcb71cc22cd6c49597ef0481058f72
PKG_MAINTAINER:=Toni Uhlig <matzeton@googlemail.com> PKG_MAINTAINER:=Toni Uhlig <matzeton@googlemail.com>
PKG_LICENSE:=GPL-2.0-or-later
PKG_LICENSE_FILES:=COPYING
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
@ -23,7 +25,6 @@ define Package/atop
TITLE:=System and process monitor for Linux TITLE:=System and process monitor for Linux
DEPENDS:=+zlib +libncurses DEPENDS:=+zlib +libncurses
URL:=https://www.atoptool.nl/ URL:=https://www.atoptool.nl/
MAINTAINER:=Toni Uhlig <matzeton@googlemail.com>
endef endef
define Package/atop/description define Package/atop/description

21
admin/atop/patches/010-makefile-missing-cflags.patch
View file

@ -1,22 +1,11 @@
diff --git a/Makefile b/Makefile
index 3bf5929..e065577 100644
--- a/Makefile --- a/Makefile
+++ b/Makefile +++ b/Makefile
@@ -32,7 +32,7 @@ VERS = $(shell ./atop -V 2>/dev/null| sed -e 's/^[^ ]* //' -e 's/ .*//') @@ -33,7 +33,7 @@ VERS = $(shell ./atop -V 2>/dev/null
all: atop atopsar atopacctd atopconvert all: atop atopsar atopacctd atopconvert atopcat
atop: atop.o $(ALLMODS) Makefile atop: atop.o $(ALLMODS) Makefile
- $(CC) -c version.c - $(CC) atop.o $(ALLMODS) -o atop -lncursesw -lz -lm -lrt $(LDFLAGS)
+ $(CC) $(CFLAGS) -c version.c + $(CC) $(CFLAGS) atop.o $(ALLMODS) -o atop -lncursesw -lz -lm -lrt $(LDFLAGS)
$(CC) atop.o $(ALLMODS) -o atop -lncurses -lz -lm -lrt $(LDFLAGS)
atopsar: atop atopsar: atop
@@ -45,7 +45,7 @@ atopconvert: atopconvert.o ln -sf atop atopsar
$(CC) atopconvert.o -o atopconvert -lz $(LDFLAGS)
netlink.o: netlink.c
- $(CC) -I. -Wall -c netlink.c
+ $(CC) $(CFLAGS) -I. -Wall -c netlink.c
clean:
rm -f *.o atop atopacctd atopconvert

10
admin/atop/patches/020-limits.patch Normal file
View file

@ -0,0 +1,10 @@
--- a/photosyst.c
+++ b/photosyst.c
@@ -149,6 +149,7 @@
**
*/
+#include <limits.h>
#include <sys/types.h>
#include <stdio.h>
#include <string.h>