busybox: update to 1.19.2 (thanks to Peter Wagner)

SVN-Revision: 28513

1 files changed, 38 insertions, 20 deletions

diff --git a/package/busybox/config/procps/Config.in b/package/busybox/config/procps/Config.in
index fbb2cee1d5..a42fdca0c0 100644
--- a/package/busybox/config/procps/Config.in
+++ b/package/busybox/config/procps/Config.in
@@ -1,3 +1,4 @@
+# DO NOT EDIT. This file is generated from Config.src
 #
 # For a description of the syntax of this configuration file,
 # see scripts/kbuild/config-language.txt.
@@ -15,6 +16,11 @@ config BUSYBOX_CONFIG_MPSTAT
 	default n
 	help
 	  Per-processor statistics
+config BUSYBOX_CONFIG_NMETER
+	bool "nmeter"
+	default n
+	help
+	  Prints selected system stats continuously, one line per update.
 config BUSYBOX_CONFIG_PMAP
        bool "pmap"
        default n
@@ -25,17 +31,42 @@ config BUSYBOX_CONFIG_POWERTOP
 	default n
 	help
 	  Analyze power consumption on Intel-based laptops
+config BUSYBOX_CONFIG_PSTREE
+	bool "pstree"
+	default n
+	help
+	  Display a tree of processes.
+config BUSYBOX_CONFIG_PWDX
+	bool "pwdx"
+	default n
+	help
+	  Report current working directory of a process
 config BUSYBOX_CONFIG_SMEMCAP
 	bool "smemcap"
 	default n
 	help
 	  smemcap is a tool for capturing process data for smem,
 	  a memory usage statistic tool.
+config BUSYBOX_CONFIG_UPTIME
+	bool "uptime"
+	default y
+	select BUSYBOX_CONFIG_PLATFORM_LINUX #sysinfo()
+	help
+	  uptime gives a one line display of the current time, how long
+	  the system has been running, how many users are currently logged
+	  on, and the system load averages for the past 1, 5, and 15 minutes.
+
+config BUSYBOX_CONFIG_FEATURE_UPTIME_UTMP_SUPPORT
+	bool "Support for showing the number of users"
+	default n
+	depends on BUSYBOX_CONFIG_UPTIME && BUSYBOX_CONFIG_FEATURE_UTMP
+	help
+	  Makes uptime display the number of users currently logged on.
 
 config BUSYBOX_CONFIG_FREE
 	bool "free"
 	default y
-	depends on BUSYBOX_CONFIG_PLATFORM_LINUX
+	select BUSYBOX_CONFIG_PLATFORM_LINUX #sysinfo()
 	help
 	  free displays the total amount of free and used physical and swap
 	  memory in the system, as well as the buffers used by the kernel.
@@ -71,12 +102,6 @@ config BUSYBOX_CONFIG_KILLALL5
 	default n
 	depends on BUSYBOX_CONFIG_KILL
 
-config BUSYBOX_CONFIG_NMETER
-	bool "nmeter"
-	default n
-	help
-	  Prints selected system stats continuously, one line per update.
-
 config BUSYBOX_CONFIG_PGREP
 	bool "pgrep"
 	default y
@@ -130,7 +155,8 @@ config BUSYBOX_CONFIG_FEATURE_PS_WIDE
 config BUSYBOX_CONFIG_FEATURE_PS_TIME
 	bool "Enable time and elapsed time output"
 	default n
-	depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP && BUSYBOX_CONFIG_PLATFORM_LINUX
+	depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	  Support -o time and -o etime output specifiers.
 
@@ -217,20 +243,12 @@ config BUSYBOX_CONFIG_FEATURE_TOPMEM
 	  Enable 's' in top (gives lots of memory info).
 
 config BUSYBOX_CONFIG_FEATURE_SHOW_THREADS
-	bool "Support for showing threads in ps/top"
+	bool "Support for showing threads in ps/pstree/top"
 	default n
-	depends on BUSYBOX_CONFIG_PS || BUSYBOX_CONFIG_TOP
+	depends on BUSYBOX_CONFIG_PS || BUSYBOX_CONFIG_TOP || BUSYBOX_CONFIG_PSTREE
 	help
-	  Enables ps -T option and 'h' command in top
-
-config BUSYBOX_CONFIG_UPTIME
-	bool "uptime"
-	default y
-	depends on BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  uptime gives a one line display of the current time, how long
-	  the system has been running, how many users are currently logged
-	  on, and the system load averages for the past 1, 5, and 15 minutes.
+	  Enables the ps -T option, showing of threads in pstree,
+	  and 'h' command in top.
 
 config BUSYBOX_CONFIG_WATCH
 	bool "watch"