summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@uclibc-ng.org>2016-07-14 21:53:11 +0200
committerWaldemar Brodkorb <wbx@uclibc-ng.org>2016-07-14 21:53:11 +0200
commit0906094ae8c0a6d80b6a92524568ac8741a45bbe (patch)
treea05919e75fc249959e11c6186ba16b36702f95e6 /package
parentd5ca856aa5e2db0d6461200dc3bf9f2b2dc63b48 (diff)
disable busybox ps, when procps is enabled
Diffstat (limited to 'package')
-rw-r--r--package/busybox/Config.in.manual6
-rw-r--r--package/busybox/config/procps/Config.in1
2 files changed, 7 insertions, 0 deletions
diff --git a/package/busybox/Config.in.manual b/package/busybox/Config.in.manual
index 747651572..42931ca97 100644
--- a/package/busybox/Config.in.manual
+++ b/package/busybox/Config.in.manual
@@ -414,3 +414,9 @@ config BUSYBOX_DISABLE_KMOD
depends on ADK_PACKAGE_KMOD
default n
+config BUSYBOX_DISABLE_PS
+ bool
+ default y if ADK_PACKAGE_PROCPS
+ depends on ADK_PACKAGE_PROCPS
+ default n
+
diff --git a/package/busybox/config/procps/Config.in b/package/busybox/config/procps/Config.in
index 885e08a12..6da62d0ce 100644
--- a/package/busybox/config/procps/Config.in
+++ b/package/busybox/config/procps/Config.in
@@ -154,6 +154,7 @@ config BUSYBOX_PKILL
config BUSYBOX_PS
bool "ps"
+ depends on !BUSYBOX_DISABLE_PS
default y
help
ps gives a snapshot of the current processes.