[git commit] ps: allow ps config options if minips is enabled

Denys Vlasenko vda.linux at googlemail.com
Tue Aug 22 09:00:32 UTC 2017


commit: https://git.busybox.net/busybox/commit/?id=753c4045e4f287fc4b4788afd94f58738a7f04b4
branch: https://git.busybox.net/busybox/commit/?id=refs/heads/master

Follow-up of commit ab77e81a8527fa11a4f9392d97c2da037d6f4f98
"klibc-utils: new applets: resume, nuke, minips"

Also put FEATURE_PS_UNUSUAL_SYSTEMS to under FEATURE_PS_TIME in the
menu.

Signed-off-by: Kang-Che Sung <explorer09 at gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 procps/ps.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/procps/ps.c b/procps/ps.c
index 7edf6db..fe2d8c2 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -17,7 +17,7 @@
 //config:config FEATURE_PS_WIDE
 //config:	bool "Enable wide output (-w)"
 //config:	default y
-//config:	depends on PS && !DESKTOP
+//config:	depends on (PS || MINIPS) && !DESKTOP
 //config:	help
 //config:	Support argument 'w' for wide output.
 //config:	If given once, 132 chars are printed, and if given more
@@ -26,7 +26,7 @@
 //config:config FEATURE_PS_LONG
 //config:	bool "Enable long output (-l)"
 //config:	default y
-//config:	depends on PS && !DESKTOP
+//config:	depends on (PS || MINIPS) && !DESKTOP
 //config:	help
 //config:	Support argument 'l' for long output.
 //config:	Adds fields PPID, RSS, START, TIME & TTY
@@ -34,14 +34,9 @@
 //config:config FEATURE_PS_TIME
 //config:	bool "Enable -o time and -o etime specifiers"
 //config:	default y
-//config:	depends on PS && DESKTOP
+//config:	depends on (PS || MINIPS) && DESKTOP
 //config:	select PLATFORM_LINUX
 //config:
-//config:config FEATURE_PS_ADDITIONAL_COLUMNS
-//config:	bool "Enable -o rgroup, -o ruser, -o nice specifiers"
-//config:	default y
-//config:	depends on PS && DESKTOP
-//config:
 //config:config FEATURE_PS_UNUSUAL_SYSTEMS
 //config:	bool "Support Linux prior to 2.4.0 and non-ELF systems"
 //config:	default n
@@ -49,6 +44,11 @@
 //config:	help
 //config:	Include support for measuring HZ on old kernels and non-ELF systems
 //config:	(if you are on Linux 2.4.0+ and use ELF, you don't need this)
+//config:
+//config:config FEATURE_PS_ADDITIONAL_COLUMNS
+//config:	bool "Enable -o rgroup, -o ruser, -o nice specifiers"
+//config:	default y
+//config:	depends on (PS || MINIPS) && DESKTOP
 
 //                 APPLET_NOEXEC:name    main location    suid_type     help
 //applet:IF_PS(    APPLET_NOEXEC(ps,     ps,  BB_DIR_BIN, BB_SUID_DROP, ps))


More information about the busybox-cvs mailing list