emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ps: allow ps config options if minips is enabled

Browse Source 
Follow-up of commit ab77e81a85
"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@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Kang-Che Sung 2017-08-19 14:18:27 +08:00 committed by Denys Vlasenko
parent bbc26c6934
commit 753c4045e4
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
procps/ps.c
View File

@ -17,7 +17,7 @@
//config:config FEATURE_PS_WIDE //config:config FEATURE_PS_WIDE
//config: bool "Enable wide output (-w)" //config: bool "Enable wide output (-w)"
//config: default y //config: default y
//config: depends on PS && !DESKTOP //config: depends on (PS || MINIPS) && !DESKTOP
//config: help //config: help
//config: Support argument 'w' for wide output. //config: Support argument 'w' for wide output.
//config: If given once, 132 chars are printed, and if given more //config: If given once, 132 chars are printed, and if given more
@ -26,7 +26,7 @@
//config:config FEATURE_PS_LONG //config:config FEATURE_PS_LONG
//config: bool "Enable long output (-l)" //config: bool "Enable long output (-l)"
//config: default y //config: default y
//config: depends on PS && !DESKTOP //config: depends on (PS || MINIPS) && !DESKTOP
//config: help //config: help
//config: Support argument 'l' for long output. //config: Support argument 'l' for long output.
//config: Adds fields PPID, RSS, START, TIME & TTY //config: Adds fields PPID, RSS, START, TIME & TTY
@ -34,14 +34,9 @@
//config:config FEATURE_PS_TIME //config:config FEATURE_PS_TIME
//config: bool "Enable -o time and -o etime specifiers" //config: bool "Enable -o time and -o etime specifiers"
//config: default y //config: default y
//config: depends on PS && DESKTOP //config: depends on (PS || MINIPS) && DESKTOP
//config: select PLATFORM_LINUX //config: select PLATFORM_LINUX
//config: //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:config FEATURE_PS_UNUSUAL_SYSTEMS
//config: bool "Support Linux prior to 2.4.0 and non-ELF systems" //config: bool "Support Linux prior to 2.4.0 and non-ELF systems"
//config: default n //config: default n
@ -49,6 +44,11 @@
//config: help //config: help
//config: Include support for measuring HZ on old kernels and non-ELF systems //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: (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_NOEXEC:name main location suid_type help
//applet:IF_PS( APPLET_NOEXEC(ps, ps, BB_DIR_BIN, BB_SUID_DROP, ps)) //applet:IF_PS( APPLET_NOEXEC(ps, ps, BB_DIR_BIN, BB_SUID_DROP, ps))