atop: new package

index 2941c45..a1da86a 100644
@@ -1687,6 +1687,7 @@ endmenu
 menu "System tools"
 	source "package/acl/Config.in"
 	source "package/android-tools/Config.in"
+	source "package/atop/Config.in"
 	source "package/attr/Config.in"
 	source "package/audit/Config.in"
 	source "package/bootutils/Config.in"

52 lines not on this page · raw message

new file mode 100644
index 0000000..d42a201
@@ -0,0 +1,18 @@
+config BR2_PACKAGE_ATOP
+	bool "atop"
+	depends on BR2_USE_MMU # fork()
+	select BR2_PACKAGE_NCURSES
+	select BR2_PACKAGE_ZLIB
+	help
+	  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.
+
+	  http://www.atoptool.nl

new file mode 100644
index 0000000..bbf268d
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256  c785b8a2355be28b3de6b58a8ea4c4fcab8fadeaa57a99afeb03c66fac8e055d  atop-2.2-3.tar.gz

new file mode 100644
index 0000000..27e1f82
@@ -0,0 +1,21 @@
+################################################################################
+#
+# atop
+#
+################################################################################
+
+ATOP_VERSION = 2.2-3
+ATOP_SITE = http://www.atoptool.nl/download
+ATOP_LICENSE = GPLv2+
+ATOP_LICENSE_FILES = COPYING
+ATOP_DEPENDENCIES = ncurses zlib
+
+define ATOP_BUILD_CMDS
+	$(MAKE) $(TARGET_CONFIGURE_OPTS) -C $(@D)
+endef
+
+define ATOP_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0755 $(@D)/atop $(TARGET_DIR)/usr/bin/atop
+endef
+
+$(eval $(generic-package))

index a1da86a..5ced012 100644
@@ -95,6 +95,7 @@ menu "Debugging, profiling and benchmark"
 	source "package/lttng-tools/Config.in"
 	source "package/mcelog/Config.in"
 	source "package/memstat/Config.in"
+	source "package/netatop/Config.in"
 	source "package/netperf/Config.in"
 	source "package/netsniff-ng/Config.in"
 	source "package/oprofile/Config.in"

index d42a201..5bcca0f 100644
@@ -15,4 +15,7 @@ config BR2_PACKAGE_ATOP
 	  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.
+
 	  http://www.atoptool.nl

new file mode 100644
index 0000000..95784c8
@@ -0,0 +1,21 @@
+Ensure init script stops the correct pid
+
+'ps' from busybox shows the pid of grep.
+Ignore the pid of the grep process, leaving only the pid of the daemon.
+
+Patch status: accepted upstream.
+
+Signed-off-by: Ricardo Martincoski <[email protected]>
+---
+diff -purN netatop-1.0.orig/netatop.init netatop-1.0/netatop.init
+--- netatop-1.0.orig/netatop.init	2016-07-15 21:22:43.646062649 -0300
++++ netatop-1.0/netatop.init	2016-07-15 21:37:18.378936625 -0300
+@@ -26,7 +26,7 @@ start() {
+ }
+ 
+ stop() {
+-	PID=$(ps -e | grep netatopd | sed -e 's/^ *//' -e 's/ .*//')
++	PID=$(ps -e | grep -v grep | grep netatopd | sed -e 's/^ *//' -e 's/ .*//')
+ 
+ 	if [ "$PID" ]
+ 	then

new file mode 100644
index 0000000..f54a55f
@@ -0,0 +1,21 @@
+config BR2_PACKAGE_NETATOP
+	bool "netatop"
+	depends on BR2_USE_MMU # atop
+	depends on BR2_LINUX_KERNEL
+	# kernel headers: >= 2.6.24
+	select BR2_PACKAGE_ATOP # runtime
+	help
+	  The optional kernel module netatop can be loaded to gather
+	  statistics about the TCP and UDP packets that have been
+	  transmitted/received per process and per thread.
+
+	  Netatop requires a Linux kernel >= 2.6.24 with the following
+	  option enabled:
+
+	  - CONFIG_NETFILTER
+
+	  http://www.atoptool.nl/netatop.php
+
+comment "netatop needs a Linux kernel >= 2.6.24 to be built"
+	depends on BR2_USE_MMU
+	depends on !BR2_LINUX_KERNEL

new file mode 100644
index 0000000..f721ddd
@@ -0,0 +1,2 @@
+# Locally computed:
+sha256  0bdde8315d2c6e4a1d87fd10d27659d76d07949b31f0dc5e81662e67e1d0fdd0  netatop-1.0.tar.gz

new file mode 100644
index 0000000..623bed7
@@ -0,0 +1,21 @@
+################################################################################
+#
+# netatop
+#
+################################################################################
+
+NETATOP_VERSION = 1.0
+NETATOP_SITE = http://www.atoptool.nl/download
+NETATOP_LICENSE = GPLv2
+# no license file. It will be added for the next version
+NETATOP_LICENSE_FILES = module/netatop.c
+
+NETATOP_MODULE_SUBDIRS = module
+
+define NETATOP_INSTALL_INIT_SYSV
+	$(INSTALL) -D -m 0755 $(@D)/netatop.init \
+		$(TARGET_DIR)/etc/init.d/S50netatop
+endef
+
+$(eval $(kernel-module))
+$(eval $(generic-package))

index 988427c..8f40a60 100644
@@ -260,6 +260,8 @@ define LINUX_KCONFIG_FIXUP_CMDS
 		$(call KCONFIG_ENABLE_OPT,CONFIG_ENABLE_DEFAULT_TRACERS,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_PERF_EVENTS,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_FUNCTION_TRACER,$(@D)/.config))
+	$(if $(BR2_PACKAGE_NETATOP),
+		$(call KCONFIG_ENABLE_OPT,CONFIG_NETFILTER,$(@D)/.config))
 	$(if $(BR2_PACKAGE_SYSTEMD),
 		$(call KCONFIG_ENABLE_OPT,CONFIG_CGROUPS,$(@D)/.config)
 		$(call KCONFIG_ENABLE_OPT,CONFIG_INOTIFY_USER,$(@D)/.config)

index f54a55f..3582962 100644
@@ -14,6 +14,8 @@ config BR2_PACKAGE_NETATOP
 
 	  - CONFIG_NETFILTER
 
+	  This option will be automatically enabled by Buildroot.
+
 	  http://www.atoptool.nl/netatop.php
 
 comment "netatop needs a Linux kernel >= 2.6.24 to be built"

index 5dd5066..0deaefe 100644
@@ -1203,6 +1203,10 @@ F:	package/gupnp-av/
 N:	Renaud Aubin <[email protected]>
 F:	package/libhttpparser/
 
+N:	Ricardo Martincoski <[email protected]>
+F:	package/atop/
+F:	package/netatop/
+
 N:	Rhys Williams <[email protected]>
 F:	package/lirc-tools/