Browse Source

busybox: fix defaults and dependencies

Waldemar Brodkorb 8 years ago
parent
commit
b2a1168dd1

+ 2 - 2
package/busybox/config/shell/Config.in

@@ -384,7 +384,7 @@ config BUSYBOX_FEATURE_SH_EXTRA_QUIET
 config BUSYBOX_FEATURE_SH_STANDALONE
 config BUSYBOX_FEATURE_SH_STANDALONE
 	bool "Standalone shell"
 	bool "Standalone shell"
 	default n
 	default n
-	depends on (BUSYBOX_HUSH || BUSYBOX_ASH) && BUSYBOX_FEATURE_PREFER_APPLETS
+	depends on (BUSYBOX_HUSH || BUSYBOX_ASH)
 	help
 	help
 	  This option causes busybox shells to use busybox applets
 	  This option causes busybox shells to use busybox applets
 	  in preference to executables in the PATH whenever possible. For
 	  in preference to executables in the PATH whenever possible. For
@@ -417,7 +417,7 @@ config BUSYBOX_FEATURE_SH_STANDALONE
 config BUSYBOX_FEATURE_SH_NOFORK
 config BUSYBOX_FEATURE_SH_NOFORK
 	bool "Run 'nofork' applets directly"
 	bool "Run 'nofork' applets directly"
 	default n
 	default n
-	depends on (BUSYBOX_HUSH || BUSYBOX_ASH) && BUSYBOX_FEATURE_PREFER_APPLETS
+	depends on (BUSYBOX_HUSH || BUSYBOX_ASH)
 	help
 	help
 	  This option causes busybox shells to not execute typical
 	  This option causes busybox shells to not execute typical
 	  fork/exec/wait sequence, but call <applet>_main directly,
 	  fork/exec/wait sequence, but call <applet>_main directly,

+ 1 - 1
package/busybox/config/util-linux/Config.in

@@ -756,7 +756,7 @@ config BUSYBOX_LINUX64
 
 
 config BUSYBOX_SWAPON
 config BUSYBOX_SWAPON
 	bool "swapon"
 	bool "swapon"
-	default y
+	default n
 	select PLATFORM_LINUX
 	select PLATFORM_LINUX
 	help
 	help
 	  This option enables the 'swapon' utility.
 	  This option enables the 'swapon' utility.