procps: switch from procps to procps-ng

The procps package is unmaintained, therefore switch to procps-ng, which
is used by many major distributions.

Cc: Michael Olbrich <m.olbrich@pengutronix.de>
Signed-off-by: Clemens Gruber <clemens.gruber@pqgruber.com>
[mol: use SF mirror in the URL]
Signed-off-by: Michael Olbrich <m.olbrich@pengutronix.de>

1 files changed, 136 insertions, 28 deletions

diff --git a/rules/procps.in b/rules/procps.in
index baf6514b5..0c60e4bb1 100644
--- a/rules/procps.in
+++ b/rules/procps.in
@@ -4,31 +4,109 @@ menuconfig PROCPS
 	tristate
 	prompt "procps                        "
 	select GCCLIBS_GCC_S
-	select NCURSES		if PROCPS_TOP
-	select NCURSES		if PROCPS_SLABTOP
+	select NCURSES if PROCPS_USES_NCURSES
+	select PROCPS_USES_NCURSES if PROCPS_SLABTOP || PROCPS_TOP || PROCPS_WATCH
+	select SYSTEMD if PROCPS_WITH_SYSTEMD
 	help
-	  The procps package contains a set of system utilities that provide
-	   system information.
+	  Contains a set of system utilities that provide information out of the
+	  pseudo-filesystem most commonly located at /proc. The programs generally
+	  concentrate on the structures that describe the running processes.
+	  Note: procps-ng is used instead of the older and unmaintained procps.
 
 if PROCPS
 
-config PROCPS_TOP
+config PROCPS_USES_NCURSES
 	bool
-	prompt "top"
-	depends on !BUSYBOX_TOP || ALLYES
+
+config PROCPS_WITH_SYSTEMD
+	bool
+	prompt "Enable systemd support"
+	default INITMETHOD_SYSTEMD
+	select SYSTEMD
 	help
-	  The  top  program provides a dynamic real-time view of a running
-	  system.
-	  Note: This command enlarges your system by the ncurses library.
+	  Enable systemd support to show information about systemd units, slices
+	  and containers in tools like ps. Recommended when using systemd.
 
-comment "busybox' top is selected!"
-	depends on BUSYBOX_TOP
+config PROCPS_FREE
+	bool
+	prompt "free"
+	depends on !BUSYBOX_FREE || ALLYES
+	help
+	  The free program reports the amount of free and used memory.
+
+comment "busybox' free is selected!"
+	depends on BUSYBOX_FREE
+
+config PROCPS_PGREP
+	bool
+	prompt "pgrep"
+	depends on !BUSYBOX_PGREP || ALLYES
+	help
+	  The pgrep program can look up processes based on name and other
+	  attributes.
+
+comment "busybox' pgrep is selected!"
+	depends on BUSYBOX_PGREP
+
+config PROCPS_PIDOF
+	bool
+	prompt "pidof"
+	depends on !BUSYBOX_PIDOF || ALLYES
+	help
+	  The pidof program can list the pids of running processes.
+
+comment "busybox' pidof is selected!"
+	depends on BUSYBOX_PIDOF
+
+config PROCPS_PKILL
+	bool
+	prompt "pkill"
+	depends on !BUSYBOX_PKILL || ALLYES
+	help
+	  The pkill program can kill processes based on name and other
+	  attributes.
+
+comment "busybox' pkill is selected!"
+	depends on BUSYBOX_PKILL
+
+config PROCPS_PMAP
+	bool
+	prompt "pmap"
+	depends on !BUSYBOX_PMAP || ALLYES
+	help
+	  The pmap program reports the memory map of a process.
+
+comment "busybox' pmap is selected!"
+	depends on BUSYBOX_PMAP
+
+config PROCPS_PS
+	bool
+	prompt "ps"
+	depends on !BUSYBOX_PS || ALLYES
+	help
+	  The ps program can analyse the states of all processes running
+	  on the system. It stands for process status.
+
+comment "busybox' ps is selected!"
+	depends on BUSYBOX_PS
+
+config PROCPS_PWDX
+	bool
+	prompt "pwdx"
+	depends on !BUSYBOX_PWDX || ALLYES
+	help
+	  The pwdx program reports the current directory of a process.
+
+comment "busybox' pwdx is selected!"
+	depends on BUSYBOX_PWDX
 
 config PROCPS_SLABTOP
 	bool
 	prompt "slabtop"
+	select PROCPS_USES_NCURSES
 	help
-	  display kernel slab cache information in real time
+	  The slabtop program displays kernel slab cache information in
+	  real time.
 	  Note: This command enlarges your system by the ncurses library.
 
 config PROCPS_SYSCTL
@@ -36,22 +114,49 @@ config PROCPS_SYSCTL
 	prompt "sysctl"
 	depends on !BUSYBOX_BB_SYSCTL || ALLYES
 	help
-	  configure kernel parameters at runtime
+	  The sysctl program configures kernel parameters at runtime.
 
 comment "busybox' sysctl is selected!"
 	depends on BUSYBOX_BB_SYSCTL
 
-config PROCPS_PS
+config PROCPS_TOP
 	bool
-	prompt "ps"
-	depends on !BUSYBOX_PS || ALLYES
+	prompt "top"
+	select PROCPS_USES_NCURSES
+	depends on !BUSYBOX_TOP || ALLYES
 	help
-	  ps stands for process status. With this command you
-	  analyse current states of all processes running on
-	  the system
+	  The  top  program provides a dynamic real-time view of a running
+	  system.
+	  Note: This command enlarges your system by the ncurses library.
 
-comment "busybox' ps is selected!"
-	depends on BUSYBOX_PS
+config PROCPS_TOP_MODERN
+	bool
+	prompt "use modern startup defaults for top"
+	depends on PROCPS_TOP
+	help
+	  Use the modern color scheme defaults and the new CPU load representation
+	  for multiple cores.
+	  If this option is disabled, the original top layout is used.
+
+comment "busybox' top is selected!"
+	depends on BUSYBOX_TOP
+
+config PROCPS_UPTIME
+	bool
+	prompt "uptime"
+	depends on !BUSYBOX_UPTIME || ALLYES
+	help
+	  The uptime program displays the system uptime.
+
+comment "busybox' uptime is selected!"
+	depends on BUSYBOX_UPTIME
+
+config PROCPS_VMSTAT
+	bool
+	prompt "vmstat"
+	help
+	  vmstat reports information about processes, memory,
+	  paging, block IO, traps, disks and cpu activity.
 
 config PROCPS_W
 	bool
@@ -59,14 +164,17 @@ config PROCPS_W
 	help
 	  Show who is logged on and what they are doing.
 
-config PROCPS_PGREP
+config PROCPS_WATCH
 	bool
-	prompt "pgrep"
-	depends on !BUSYBOX_PGREP || ALLYES
+	prompt "watch"
+	select PROCPS_USES_NCURSES
+	depends on !BUSYBOX_WATCH || ALLYES
 	help
-	  look up processes based on name and other attributes
+	  The watch program can execute a program periodically, displaying the
+	  output fullscreen.
+	  Note: This command enlarges your system by the ncurses library.
 
-comment "busybox' pgrep is selected!"
-	depends on BUSYBOX_PGREP
+comment "busybox' watch is selected!"
+	depends on BUSYBOX_WATCH
 
 endif