From 0820b94a8326b3e8cc75d0078f93c7626ccf8147 Mon Sep 17 00:00:00 2001 From: Phil Sutter Date: Thu, 25 Feb 2021 09:10:55 +0100 Subject: package/busybox: Update stored config files When updating busybox, these files must be updated - otherwise the config written to busybox source tree when building may be incomplete, causing the build to hang. Fixes: e4800c73e63e5 ("busybox: update to latest") Signed-off-by: Phil Sutter --- package/busybox/config/editors/Config.in | 253 ++++++++++++++----------------- 1 file changed, 117 insertions(+), 136 deletions(-) (limited to 'package/busybox/config/editors') diff --git a/package/busybox/config/editors/Config.in b/package/busybox/config/editors/Config.in index 5c6b8a8be..3e48e371d 100644 --- a/package/busybox/config/editors/Config.in +++ b/package/busybox/config/editors/Config.in @@ -1,152 +1,207 @@ # DO NOT EDIT. This file is generated from Config.src # # For a description of the syntax of this configuration file, -# see scripts/kbuild/config-language.txt. +# see docs/Kconfig-language.txt. # menu "Editors" -config BUSYBOX_PATCH - bool "patch" - depends on !BUSYBOX_DISABLE_PATCH - default n +config BUSYBOX_AWK + bool "awk (23 kb)" + default y + help + Awk is used as a pattern scanning and processing language. + +config BUSYBOX_FEATURE_AWK_LIBM + bool "Enable math functions (requires libm)" + default y + depends on BUSYBOX_AWK help - Apply a unified diff formatted patch. + Enable math functions of the Awk programming language. + NOTE: This requires libm to be present for linking. +config BUSYBOX_FEATURE_AWK_GNU_EXTENSIONS + bool "Enable a few GNU extensions" + default y + depends on BUSYBOX_AWK + help + Enable a few features from gawk: + * command line option -e AWK_PROGRAM + * simultaneous use of -f and -e on the command line. + This enables the use of awk library files. + Example: awk -f mylib.awk -e '{print myfunction($1);}' ... +config BUSYBOX_CMP + bool "cmp (4.9 kb)" + default y + help + cmp is used to compare two files and returns the result + to standard output. +config BUSYBOX_DIFF + bool "diff (13 kb)" + default y + help + diff compares two files or directories and outputs the + differences between them in a form that can be given to + the patch command. + +config BUSYBOX_FEATURE_DIFF_LONG_OPTIONS + bool "Enable long options" + default y + depends on BUSYBOX_DIFF && BUSYBOX_LONG_OPTS + +config BUSYBOX_FEATURE_DIFF_DIR + bool "Enable directory support" + default y + depends on BUSYBOX_DIFF + help + This option enables support for directory and subdirectory + comparison. +config BUSYBOX_ED + bool "ed (21 kb)" + default y + help + The original 1970's Unix text editor, from the days of teletypes. + Small, simple, evil. Part of SUSv3. If you're not already using + this, you don't need it. +config BUSYBOX_PATCH + bool "patch (9.4 kb)" + default y + help + Apply a unified diff formatted patch. +config BUSYBOX_SED + bool "sed (12 kb)" + default y + help + sed is used to perform text transformations on a file + or input from a pipeline. config BUSYBOX_VI - bool "vi" + bool "vi (23 kb)" default y help - 'vi' is a text editor. More specifically, it is the One True - text editor . It does, however, have a rather steep - learning curve. If you are not already comfortable with 'vi' - you may wish to use something else. + 'vi' is a text editor. More specifically, it is the One True + text editor . It does, however, have a rather steep + learning curve. If you are not already comfortable with 'vi' + you may wish to use something else. config BUSYBOX_FEATURE_VI_MAX_LEN - int "Maximum screen width in vi" + int "Maximum screen width" range 256 16384 default 4096 depends on BUSYBOX_VI help - Contrary to what you may think, this is not eating much. - Make it smaller than 4k only if you are very limited on memory. + Contrary to what you may think, this is not eating much. + Make it smaller than 4k only if you are very limited on memory. config BUSYBOX_FEATURE_VI_8BIT - bool "Allow vi to display 8-bit chars (otherwise shows dots)" + bool "Allow to display 8-bit chars (otherwise shows dots)" default n depends on BUSYBOX_VI help - If your terminal can display characters with high bit set, - you may want to enable this. Note: vi is not Unicode-capable. - If your terminal combines several 8-bit bytes into one character - (as in Unicode mode), this will not work properly. + If your terminal can display characters with high bit set, + you may want to enable this. Note: vi is not Unicode-capable. + If your terminal combines several 8-bit bytes into one character + (as in Unicode mode), this will not work properly. config BUSYBOX_FEATURE_VI_COLON bool "Enable \":\" colon commands (no \"ex\" mode)" default y depends on BUSYBOX_VI help - Enable a limited set of colon commands for vi. This does not - provide an "ex" mode. + Enable a limited set of colon commands. This does not + provide an "ex" mode. config BUSYBOX_FEATURE_VI_YANKMARK bool "Enable yank/put commands and mark cmds" default y depends on BUSYBOX_VI help - This will enable you to use yank and put, as well as mark in - busybox vi. + This enables you to use yank and put, as well as mark. config BUSYBOX_FEATURE_VI_SEARCH bool "Enable search and replace cmds" default y depends on BUSYBOX_VI help - Select this if you wish to be able to do search and replace in - busybox vi. + Select this if you wish to be able to do search and replace. config BUSYBOX_FEATURE_VI_REGEX_SEARCH bool "Enable regex in search and replace" default n # Uses GNU regex, which may be unavailable. FIXME depends on BUSYBOX_FEATURE_VI_SEARCH help - Use extended regex search. + Use extended regex search. config BUSYBOX_FEATURE_VI_USE_SIGNALS bool "Catch signals" default y depends on BUSYBOX_VI help - Selecting this option will make busybox vi signal aware. This will - make busybox vi support SIGWINCH to deal with Window Changes, catch - Ctrl-Z and Ctrl-C and alarms. + Selecting this option will make vi signal aware. This will support + SIGWINCH to deal with Window Changes, catch ^Z and ^C and alarms. config BUSYBOX_FEATURE_VI_DOT_CMD bool "Remember previous cmd and \".\" cmd" default y depends on BUSYBOX_VI help - Make busybox vi remember the last command and be able to repeat it. + Make vi remember the last command and be able to repeat it. config BUSYBOX_FEATURE_VI_READONLY bool "Enable -R option and \"view\" mode" default y depends on BUSYBOX_VI help - Enable the read-only command line option, which allows the user to - open a file in read-only mode. + Enable the read-only command line option, which allows the user to + open a file in read-only mode. config BUSYBOX_FEATURE_VI_SETOPTS - bool "Enable set-able options, ai ic showmatch" + bool "Enable settable options, ai ic showmatch" default y depends on BUSYBOX_VI help - Enable the editor to set some (ai, ic, showmatch) options. + Enable the editor to set some (ai, ic, showmatch) options. config BUSYBOX_FEATURE_VI_SET - bool "Support for :set" + bool "Support :set" default y depends on BUSYBOX_VI - help - Support for ":set". config BUSYBOX_FEATURE_VI_WIN_RESIZE bool "Handle window resize" default y depends on BUSYBOX_VI help - Make busybox vi behave nicely with terminals that get resized. + Behave nicely with terminals that get resized. config BUSYBOX_FEATURE_VI_ASK_TERMINAL bool "Use 'tell me cursor position' ESC sequence to measure window" default y depends on BUSYBOX_VI help - If terminal size can't be retrieved and $LINES/$COLUMNS are not set, - this option makes vi perform a last-ditch effort to find it: - position cursor to 999,999 and ask terminal to report real - cursor position using "ESC [ 6 n" escape sequence, then read stdin. - - This is not clean but helps a lot on serial lines and such. + If terminal size can't be retrieved and $LINES/$COLUMNS are not set, + this option makes vi perform a last-ditch effort to find it: + position cursor to 999,999 and ask terminal to report real + cursor position using "ESC [ 6 n" escape sequence, then read stdin. + This is not clean but helps a lot on serial lines and such. config BUSYBOX_FEATURE_VI_UNDO - bool "Support undo command 'u'" + bool "Support undo command \"u\"" default y depends on BUSYBOX_VI help - Support the 'u' command to undo insertion, deletion, and replacement - of text. + Support the 'u' command to undo insertion, deletion, and replacement + of text. config BUSYBOX_FEATURE_VI_UNDO_QUEUE bool "Enable undo operation queuing" default y depends on BUSYBOX_FEATURE_VI_UNDO help - The vi undo functions can use an intermediate queue to greatly lower - malloc() calls and overhead. When the maximum size of this queue is - reached, the contents of the queue are committed to the undo stack. - This increases the size of the undo code and allows some undo - operations (especially un-typing/backspacing) to be far more useful. + The vi undo functions can use an intermediate queue to greatly lower + malloc() calls and overhead. When the maximum size of this queue is + reached, the contents of the queue are committed to the undo stack. + This increases the size of the undo code and allows some undo + operations (especially un-typing/backspacing) to be far more useful. config BUSYBOX_FEATURE_VI_UNDO_QUEUE_MAX int "Maximum undo character queue size" @@ -154,94 +209,20 @@ config BUSYBOX_FEATURE_VI_UNDO_QUEUE_MAX range 32 65536 depends on BUSYBOX_FEATURE_VI_UNDO_QUEUE help - This option sets the number of bytes used at runtime for the queue. - Smaller values will create more undo objects and reduce the amount - of typed or backspaced characters that are grouped into one undo - operation; larger values increase the potential size of each undo - and will generally malloc() larger objects and less frequently. - Unless you want more (or less) frequent "undo points" while typing, - you should probably leave this unchanged. - -config BUSYBOX_AWK - bool "awk" - default n - help - Awk is used as a pattern scanning and processing language. This is - the BusyBox implementation of that programming language. - -config BUSYBOX_FEATURE_AWK_LIBM - bool "Enable math functions (requires libm)" - default n - depends on BUSYBOX_AWK - help - Enable math functions of the Awk programming language. - NOTE: This will require libm to be present for linking. - -config BUSYBOX_FEATURE_AWK_GNU_EXTENSIONS - bool "Enable a few GNU extensions" - default n - depends on BUSYBOX_AWK - help - Enable a few features from gawk: - * command line option -e AWK_PROGRAM - * simultaneous use of -f and -e on the command line. - This enables the use of awk library files. - Ex: awk -f mylib.awk -e '{print myfunction($1);}' ... - -config BUSYBOX_CMP - bool "cmp" - default n - help - cmp is used to compare two files and returns the result - to standard output. - -config BUSYBOX_DIFF - bool "diff" - depends on !BUSYBOX_DISABLE_DIFF - default n - help - diff compares two files or directories and outputs the - differences between them in a form that can be given to - the patch command. - -config BUSYBOX_FEATURE_DIFF_LONG_OPTIONS - bool "Enable long options" - default n - depends on BUSYBOX_DIFF && BUSYBOX_LONG_OPTS - help - Enable use of long options. - -config BUSYBOX_FEATURE_DIFF_DIR - bool "Enable directory support" - default n - depends on BUSYBOX_DIFF - help - This option enables support for directory and subdirectory - comparison. - -config BUSYBOX_ED - bool "ed" - depends on !BUSYBOX_DISABLE_ED - default n - help - The original 1970's Unix text editor, from the days of teletypes. - Small, simple, evil. Part of SUSv3. If you're not already using - this, you don't need it. - -config BUSYBOX_SED - bool "sed" - depends on !BUSYBOX_DISABLE_SED - default n - help - sed is used to perform text transformations on a file - or input from a pipeline. + This option sets the number of bytes used at runtime for the queue. + Smaller values will create more undo objects and reduce the amount + of typed or backspaced characters that are grouped into one undo + operation; larger values increase the potential size of each undo + and will generally malloc() larger objects and less frequently. + Unless you want more (or less) frequent "undo points" while typing, + you should probably leave this unchanged. config BUSYBOX_FEATURE_ALLOW_EXEC bool "Allow vi and awk to execute shell commands" - default n + default y depends on BUSYBOX_VI || BUSYBOX_AWK help - Enables vi and awk features which allows user to execute - shell commands (using system() C call). + Enables vi and awk features which allow user to execute + shell commands (using system() C call). endmenu -- cgit v1.2.3