[package] update busybox to 1.15.2 (#5926)

[openwrt.git] / package / busybox / config / shell / Config.in

diff --git a/package/busybox/config/shell/Config.in b/package/busybox/config/shell/Config.in
index 233c3a8..f3c998c 100644 (file)
--- a/package/busybox/config/shell/Config.in
+++ b/package/busybox/config/shell/Config.in
@@ -24,9 +24,9 @@ config BUSYBOX_CONFIG_FEATURE_SH_IS_HUSH
 ####   select LASH
 ####   bool "lash"
 
 ####   select LASH
 ####   bool "lash"
 

-config BUSYBOX_CONFIG_FEATURE_SH_IS_MSH
-       select BUSYBOX_CONFIG_MSH
-       bool "msh"
+####config FEATURE_SH_IS_MSH
+####   select MSH
+####   bool "msh"

 
 config BUSYBOX_CONFIG_FEATURE_SH_IS_NONE
        bool "none"
 
 config BUSYBOX_CONFIG_FEATURE_SH_IS_NONE
        bool "none"


@@ -43,9 +43,6 @@ config BUSYBOX_CONFIG_ASH
          shell (by Herbert Xu), which was created by porting the 'ash' shell
          (written by Kenneth Almquist) from NetBSD.
 
          shell (by Herbert Xu), which was created by porting the 'ash' shell
          (written by Kenneth Almquist) from NetBSD.
 

-comment "Ash Shell Options"
-       depends on BUSYBOX_CONFIG_ASH
-

 config BUSYBOX_CONFIG_ASH_BASH_COMPAT
        bool "bash-compatible extensions"
        default y
 config BUSYBOX_CONFIG_ASH_BASH_COMPAT
        bool "bash-compatible extensions"
        default y


@@ -169,6 +166,13 @@ config BUSYBOX_CONFIG_HUSH
          It does not handle select, aliases, brace expansion,
          tilde expansion, &>file and >&file redirection of stdout+stderr.
 
          It does not handle select, aliases, brace expansion,
          tilde expansion, &>file and >&file redirection of stdout+stderr.
 

+config BUSYBOX_CONFIG_HUSH_BASH_COMPAT
+       bool "bash-compatible extensions"
+       default y
+       depends on BUSYBOX_CONFIG_HUSH
+       help
+         Enable bash-compatible extensions.
+

 config BUSYBOX_CONFIG_HUSH_HELP
        bool "help builtin"
        default n
 config BUSYBOX_CONFIG_HUSH_HELP
        bool "help builtin"
        default n


@@ -232,6 +236,20 @@ config BUSYBOX_CONFIG_HUSH_FUNCTIONS
        help
          Enable support for shell functions in hush. +800 bytes.
 
        help
          Enable support for shell functions in hush. +800 bytes.
 

+config BUSYBOX_CONFIG_HUSH_LOCAL
+       bool "Support local builtin"
+       default n
+       depends on BUSYBOX_CONFIG_HUSH_FUNCTIONS
+       help
+         Enable support for local variables in functions.
+
+config BUSYBOX_CONFIG_HUSH_EXPORT_N
+       bool "Support export '-n' option"
+       default n
+       depends on BUSYBOX_CONFIG_HUSH
+       help
+         Enable support for export '-n' option in hush. It is a bash extension.
+

 config BUSYBOX_CONFIG_LASH
        bool "lash (deprecated: aliased to hush)"
        default n
 config BUSYBOX_CONFIG_LASH
        bool "lash (deprecated: aliased to hush)"
        default n


@@ -242,6 +260,7 @@ config BUSYBOX_CONFIG_LASH
 config BUSYBOX_CONFIG_MSH
        bool "msh (deprecated: please use hush)"
        default n
 config BUSYBOX_CONFIG_MSH
        bool "msh (deprecated: please use hush)"
        default n

+       select BUSYBOX_CONFIG_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.
        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.


@@ -254,9 +273,6 @@ config BUSYBOX_CONFIG_MSH
 #        It uses only vfork, so it can be used on uClinux systems.
 
 
 #        It uses only vfork, so it can be used on uClinux systems.
 
 

-comment "Bourne Shell Options"
-       depends on BUSYBOX_CONFIG_MSH || BUSYBOX_CONFIG_LASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_ASH
-

 config BUSYBOX_CONFIG_SH_MATH_SUPPORT
        bool "POSIX math support"
        default y
 config BUSYBOX_CONFIG_SH_MATH_SUPPORT
        bool "POSIX math support"
        default y