diff options
| author | Rosen Penev <rosenp@gmail.com> | 2021-01-19 15:21:30 -0800 |
|---|---|---|
| committer | Rosen Penev <rosenp@gmail.com> | 2021-01-20 20:21:41 -0800 |
| commit | 699ccdd12f4950ee68ec054dd48d74b58a13aa9c (patch) | |
| tree | 3fff43dd06c32528f3f21bd898e7d24e89a2e0b0 /admin/atop | |
| parent | 515c780da346f0b89bbb5f52c8b262b971eaef0c (diff) | |
atop: update to 2.6.0
Reordered some stuff in the Makefile for consistency between packages.
Refreshed patches.
Added a musl fix.
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Diffstat (limited to 'admin/atop')
| -rw-r--r-- | admin/atop/Makefile | 11 | ||||
| -rw-r--r-- | admin/atop/patches/010-makefile-missing-cflags.patch | 21 | ||||
| -rw-r--r-- | admin/atop/patches/020-limits.patch | 10 |
3 files changed, 21 insertions, 21 deletions
diff --git a/admin/atop/Makefile b/admin/atop/Makefile index 4c3b4ff4a..f7c0735e1 100644 --- a/admin/atop/Makefile +++ b/admin/atop/Makefile @@ -7,13 +7,15 @@ include $(TOPDIR)/rules.mk PKG_NAME:=atop PKG_RELEASE:=1 -PKG_VERSION:=2.5.0 -PKG_LICENSE:=GPL-2.0-or-later -PKG_SOURCE_URL:=https://www.atoptool.nl/download/ -PKG_HASH:=4b911057ce50463b6e8b3016c5963d48535c0cddeebc6eda817e292b22f93f33 +PKG_VERSION:=2.6.0 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_LICENSE:=GPL-2.0-or-later +PKG_LICENSE_FILES:=COPYING include $(INCLUDE_DIR)/package.mk @@ -23,7 +25,6 @@ define Package/atop TITLE:=System and process monitor for Linux DEPENDS:=+zlib +libncurses URL:=https://www.atoptool.nl/ - MAINTAINER:=Toni Uhlig <matzeton@googlemail.com> endef define Package/atop/description diff --git a/admin/atop/patches/010-makefile-missing-cflags.patch b/admin/atop/patches/010-makefile-missing-cflags.patch index 6754ff77c..9d83c4811 100644 --- a/admin/atop/patches/010-makefile-missing-cflags.patch +++ b/admin/atop/patches/010-makefile-missing-cflags.patch @@ -1,22 +1,11 @@ -diff --git a/Makefile b/Makefile -index 3bf5929..e065577 100644 --- a/Makefile +++ b/Makefile -@@ -32,7 +32,7 @@ VERS = $(shell ./atop -V 2>/dev/null| sed -e 's/^[^ ]* //' -e 's/ .*//') - all: atop atopsar atopacctd atopconvert +@@ -33,7 +33,7 @@ VERS = $(shell ./atop -V 2>/dev/null + all: atop atopsar atopacctd atopconvert atopcat atop: atop.o $(ALLMODS) Makefile -- $(CC) -c version.c -+ $(CC) $(CFLAGS) -c version.c - $(CC) atop.o $(ALLMODS) -o atop -lncurses -lz -lm -lrt $(LDFLAGS) +- $(CC) atop.o $(ALLMODS) -o atop -lncursesw -lz -lm -lrt $(LDFLAGS) ++ $(CC) $(CFLAGS) atop.o $(ALLMODS) -o atop -lncursesw -lz -lm -lrt $(LDFLAGS) atopsar: atop -@@ -45,7 +45,7 @@ atopconvert: atopconvert.o - $(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 + ln -sf atop atopsar diff --git a/admin/atop/patches/020-limits.patch b/admin/atop/patches/020-limits.patch new file mode 100644 index 000000000..b1384b29c --- /dev/null +++ b/admin/atop/patches/020-limits.patch @@ -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> |