Import busybox-1.15.0 kconfig symbolsembtk-busybox-kconfigs-1.15.0

Signed-off-by: Abdoulaye Walsimou Gaye <awg@embtoolkit.org>

1 files changed, 25 insertions, 15 deletions

diff --git a/busybox-shell.kconfig b/busybox-shell.kconfig
index 7a6bbae..158a7e4 100644
--- a/busybox-shell.kconfig
+++ b/busybox-shell.kconfig
@@ -20,6 +20,7 @@ config KEMBTK_BUSYB_FEATURE_SH_IS_ASH
 config KEMBTK_BUSYB_FEATURE_SH_IS_HUSH
 	select KEMBTK_BUSYB_HUSH
 	bool "hush"
+	depends on EMBTK_BB_VERSION_1_13_X || EMBTK_BB_VERSION_1_14_X
 
 ####config FEATURE_SH_IS_LASH
 ####	select KEMBTK_BUSYB_LASH
@@ -43,9 +44,6 @@ config KEMBTK_BUSYB_ASH
 	  shell (by Herbert Xu), which was created by porting the 'ash' shell
 	  (written by Kenneth Almquist) from NetBSD.
 
-comment "Ash Shell Options"
-	depends on KEMBTK_BUSYB_ASH
-
 config KEMBTK_BUSYB_ASH_BASH_COMPAT
 	bool "bash-compatible extensions"
 	default y
@@ -88,16 +86,16 @@ config KEMBTK_BUSYB_ASH_MATH_SUPPORT
 	depends on KEMBTK_BUSYB_ASH
 	depends on EMBTK_BB_VERSION_1_13_X
 	help
-	 Enable math support in the ash shell.
+		Enable math support in the ash shell.
 
 config KEMBTK_BUSYB_ASH_MATH_SUPPORT_64
 	bool "Extend Posix math support to 64 bit"
 	depends on KEMBTK_BUSYB_ASH_MATH_SUPPORT
 	depends on EMBTK_BB_VERSION_1_13_X
 	help
-	 Enable 64-bit math support in the ash shell. This will make
-	 the shell slightly larger, but will allow computation with very
-	 large numbers.
+		Enable 64-bit math support in the ash shell. This will make
+		the shell slightly larger, but will allow computation with very
+		large numbers.
 
 config KEMBTK_BUSYB_ASH_GETOPTS
 	bool "Builtin getopt to parse positional parameters"
@@ -179,6 +177,14 @@ config KEMBTK_BUSYB_HUSH
 	  It does not handle select, aliases, brace expansion,
 	  tilde expansion, &>file and >&file redirection of stdout+stderr.
 
+config KEMBTK_BUSYB_HUSH_BASH_COMPAT
+	bool "bash-compatible extensions"
+	default y
+	depends on KEMBTK_BUSYB_HUSH
+	depends on EMBTK_BB_VERSION_1_15_X
+	help
+	  Enable bash-compatible extensions.
+
 config KEMBTK_BUSYB_HUSH_HELP
 	bool "help builtin"
 	depends on KEMBTK_BUSYB_HUSH
@@ -232,25 +238,32 @@ config KEMBTK_BUSYB_HUSH_CASE
 config KEMBTK_BUSYB_HUSH_FUNCTIONS
 	bool "Support funcname() { commands; } syntax"
 	depends on KEMBTK_BUSYB_HUSH
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Enable support for shell functions in hush. +800 bytes.
 
+config KEMBTK_BUSYB_HUSH_LOCAL
+	bool "Support local builtin"
+	depends on KEMBTK_BUSYB_HUSH_FUNCTIONS
+	help
+	  Enable support for local variables in functions.
+
 config KEMBTK_BUSYB_HUSH_EXPORT_N
 	bool "Support export '-n' option"
 	depends on KEMBTK_BUSYB_HUSH
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Enable support for export '-n' option in hush. It is a bash extension.
 
 config KEMBTK_BUSYB_LASH
 	bool "lash (deprecated: aliased to hush)"
-	select KEMBTK_BUSYB_HUSH
+	select KEMBTK_BUSYB_HUSH if EMBTK_BB_VERSION_1_15_X
 	help
 	  lash is deprecated and will be removed, please migrate to hush.
 
 config KEMBTK_BUSYB_MSH
 	bool "msh (deprecated: please use hush)"
+	select KEMBTK_BUSYB_HUSH
 	help
 	  msh is deprecated and will be removed, please migrate to hush.
 	  If there is a feature msh has but hush does not, please let us know.
@@ -263,21 +276,18 @@ config KEMBTK_BUSYB_MSH
 #	  It uses only vfork, so it can be used on uClinux systems.
 
 
-comment "Bourne Shell Options"
-	depends on KEMBTK_BUSYB_MSH || KEMBTK_BUSYB_LASH || KEMBTK_BUSYB_HUSH || KEMBTK_BUSYB_ASH
-
 config KEMBTK_BUSYB_SH_MATH_SUPPORT
 	bool "POSIX math support"
 	default y
 	depends on KEMBTK_BUSYB_ASH || KEMBTK_BUSYB_HUSH
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Enable math support in the shell via $((...)) syntax.
 
 config KEMBTK_BUSYB_SH_MATH_SUPPORT_64
 	bool "Extend POSIX math support to 64 bit"
 	depends on KEMBTK_BUSYB_SH_MATH_SUPPORT
-	depends on EMBTK_BB_VERSION_1_14_X
+	depends on EMBTK_BB_VERSION_1_14_X || EMBTK_BB_VERSION_1_15_X
 	help
 	  Enable 64-bit math support in the shell. This will make the shell
 	  slightly larger, but will allow computation with very large numbers.