From b2a1168dd11a787442f09eebe74b2c6d07966df0 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Mon, 26 Dec 2016 19:26:11 +0100 Subject: busybox: fix defaults and dependencies --- package/busybox/config/shell/Config.in | 4 ++-- package/busybox/config/util-linux/Config.in | 2 +- 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 _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. -- cgit v1.2.3