summaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorWaldemar Brodkorb <wbx@openadk.org>2016-12-26 19:26:11 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2016-12-26 19:26:21 +0100
commitb2a1168dd11a787442f09eebe74b2c6d07966df0 (patch)
tree511330820ba849c6472bd4c9e437e3daa312a8ce /package
parent96403fca4d9f26e548310177c7f13e431ff09669 (diff)
busybox: fix defaults and dependencies
Diffstat (limited to 'package')
-rw-r--r--package/busybox/config/shell/Config.in4
-rw-r--r--package/busybox/config/util-linux/Config.in2
2 files changed, 3 insertions, 3 deletions
diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in
index 80038edb2..019b3e600 100644
--- a/package/busybox/config/shell/Config.in
+++ b/package/busybox/config/shell/Config.in
@@ -384,7 +384,7 @@ config BUSYBOX_FEATURE_SH_EXTRA_QUIET
config BUSYBOX_FEATURE_SH_STANDALONE
bool "Standalone shell"
default n
- depends on (BUSYBOX_HUSH || BUSYBOX_ASH) && BUSYBOX_FEATURE_PREFER_APPLETS
+ depends on (BUSYBOX_HUSH || BUSYBOX_ASH)
help
This option causes busybox shells to use busybox applets
in preference to executables in the PATH whenever possible. For
@@ -417,7 +417,7 @@ config BUSYBOX_FEATURE_SH_STANDALONE
config BUSYBOX_FEATURE_SH_NOFORK
bool "Run 'nofork' applets directly"
default n
- depends on (BUSYBOX_HUSH || BUSYBOX_ASH) && BUSYBOX_FEATURE_PREFER_APPLETS
+ depends on (BUSYBOX_HUSH || BUSYBOX_ASH)
help
This option causes busybox shells to not execute typical
fork/exec/wait sequence, but call <applet>_main directly,
diff --git a/package/busybox/config/util-linux/Config.in b/package/busybox/config/util-linux/Config.in
index 00f98a722..c1c89f26d 100644
--- a/package/busybox/config/util-linux/Config.in
+++ b/package/busybox/config/util-linux/Config.in
@@ -756,7 +756,7 @@ config BUSYBOX_LINUX64
config BUSYBOX_SWAPON
bool "swapon"
- default y
+ default n
select PLATFORM_LINUX
help
This option enables the 'swapon' utility.