OpenWrt – Diff between revs 2 and 3

Subversion Repositories:
Rev:
Show entire fileRegard whitespace
Rev 2 Rev 3
Line 1... Line 1...
1 # DO NOT EDIT. This file is generated from Config.src 1 # DO NOT EDIT. This file is generated from Config.src
2 # 2 #
3 # For a description of the syntax of this configuration file, 3 # For a description of the syntax of this configuration file,
4 # see docs/Kconfig-language.txt. 4 # see scripts/kbuild/config-language.txt.
5 # 5 #
Line 6... Line 6...
6   6  
Line 77... Line 77...
77   77  
Line 78... Line 78...
78 endchoice 78 endchoice
79   79  
80   80  
81 config BUSYBOX_CONFIG_ASH 81 config BUSYBOX_CONFIG_ASH
82 bool "ash (78 kb)" 82 bool "ash"
-   83 default BUSYBOX_DEFAULT_ASH
83 default BUSYBOX_DEFAULT_ASH 84 depends on !BUSYBOX_CONFIG_NOMMU
84 depends on !BUSYBOX_CONFIG_NOMMU 85 help
85 help 86 Tha 'ash' shell adds about 60k in the default configuration and is
86 The most complete and most pedantically correct shell included with 87 the most complete and most pedantically correct shell included with
Line 87... Line 88...
87 busybox. This shell is actually a derivative of the Debian 'dash' 88 busybox. This shell is actually a derivative of the Debian 'dash'
Line 112... Line 113...
112 config BUSYBOX_CONFIG_ASH_BASH_COMPAT 113 config BUSYBOX_CONFIG_ASH_BASH_COMPAT
113 bool "bash-compatible extensions" 114 bool "bash-compatible extensions"
114 default BUSYBOX_DEFAULT_ASH_BASH_COMPAT 115 default BUSYBOX_DEFAULT_ASH_BASH_COMPAT
115 depends on BUSYBOX_CONFIG_ASH || BUSYBOX_CONFIG_SH_IS_ASH || BUSYBOX_CONFIG_BASH_IS_ASH 116 depends on BUSYBOX_CONFIG_ASH || BUSYBOX_CONFIG_SH_IS_ASH || BUSYBOX_CONFIG_BASH_IS_ASH
Line 116... Line -...
116   -  
117 config BUSYBOX_CONFIG_ASH_BASH_SOURCE_CURDIR -  
118 bool "'source' and '.' builtins search current directory after $PATH" -  
119 default BUSYBOX_DEFAULT_ASH_BASH_SOURCE_CURDIR # do not encourage non-standard behavior -  
120 depends on BUSYBOX_CONFIG_ASH_BASH_COMPAT -  
121 help -  
122 This is not compliant with standards. Avoid if possible. -  
123   -  
124 config BUSYBOX_CONFIG_ASH_BASH_NOT_FOUND_HOOK -  
125 bool "command_not_found_handle hook support" -  
126 default BUSYBOX_DEFAULT_ASH_BASH_NOT_FOUND_HOOK -  
127 depends on BUSYBOX_CONFIG_ASH_BASH_COMPAT -  
128 help -  
129 Enable support for the 'command_not_found_handle' hook function, -  
130 from GNU bash, which allows for alternative command not found -  
131 handling. -  
132   117  
133 config BUSYBOX_CONFIG_ASH_JOB_CONTROL 118 config BUSYBOX_CONFIG_ASH_JOB_CONTROL
134 bool "Job control" 119 bool "Job control"
135 default BUSYBOX_DEFAULT_ASH_JOB_CONTROL 120 default BUSYBOX_DEFAULT_ASH_JOB_CONTROL
Line 211... Line 196...
211 you to run the specified command or builtin, 196 you to run the specified command or builtin,
212 even when there is a function with the same name. 197 even when there is a function with the same name.
Line 213... Line 198...
213   198  
214 endif # ash options 199 endif # ash options
215 config BUSYBOX_CONFIG_CTTYHACK 200 config BUSYBOX_CONFIG_CTTYHACK
216 bool "cttyhack (2.4 kb)" 201 bool "cttyhack"
217 default BUSYBOX_DEFAULT_CTTYHACK 202 default BUSYBOX_DEFAULT_CTTYHACK
218 help 203 help
219 One common problem reported on the mailing list is the "can't 204 One common problem reported on the mailing list is the "can't
220 access tty; job control turned off" error message, which typically 205 access tty; job control turned off" error message, which typically
Line 254... Line 239...
254   239  
Line 255... Line 240...
255 Starting getty on a controlling tty from a shell script: 240 Starting getty on a controlling tty from a shell script:
256   241  
257 # getty 115200 $(cttyhack) 242 # getty 115200 $(cttyhack)
258 config BUSYBOX_CONFIG_HUSH 243 config BUSYBOX_CONFIG_HUSH
259 bool "hush (68 kb)" 244 bool "hush"
260 default BUSYBOX_DEFAULT_HUSH 245 default BUSYBOX_DEFAULT_HUSH
261 help 246 help
262 hush is a small shell. It handles the normal flow control 247 hush is a small shell (25k). It handles the normal flow control
263 constructs such as if/then/elif/else/fi, for/in/do/done, while loops, 248 constructs such as if/then/elif/else/fi, for/in/do/done, while loops,
Line 264... Line 249...
264 case/esac. Redirections, here documents, $((arithmetic)) 249 case/esac. Redirections, here documents, $((arithmetic))
Line 279... Line 264...
279 default BUSYBOX_DEFAULT_HUSH_BRACE_EXPANSION 264 default BUSYBOX_DEFAULT_HUSH_BRACE_EXPANSION
280 depends on BUSYBOX_CONFIG_HUSH_BASH_COMPAT 265 depends on BUSYBOX_CONFIG_HUSH_BASH_COMPAT
281 help 266 help
282 Enable {abc,def} extension. 267 Enable {abc,def} extension.
Line 283... Line -...
283   -  
284 config BUSYBOX_CONFIG_HUSH_LINENO_VAR -  
285 bool "$LINENO variable" -  
286 default BUSYBOX_DEFAULT_HUSH_LINENO_VAR -  
287 depends on BUSYBOX_CONFIG_HUSH_BASH_COMPAT -  
288   -  
289 config BUSYBOX_CONFIG_HUSH_BASH_SOURCE_CURDIR -  
290 bool "'source' and '.' builtins search current directory after $PATH" -  
291 default BUSYBOX_DEFAULT_HUSH_BASH_SOURCE_CURDIR # do not encourage non-standard behavior -  
292 depends on BUSYBOX_CONFIG_HUSH_BASH_COMPAT -  
293 help -  
294 This is not compliant with standards. Avoid if possible. -  
295   268  
296 config BUSYBOX_CONFIG_HUSH_INTERACTIVE 269 config BUSYBOX_CONFIG_HUSH_INTERACTIVE
297 bool "Interactive mode" 270 bool "Interactive mode"
298 default BUSYBOX_DEFAULT_HUSH_INTERACTIVE 271 default BUSYBOX_DEFAULT_HUSH_INTERACTIVE
299 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH 272 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
Line 318... Line 291...
318 "cmd &" still works by simply spawning a process and immediately 291 "cmd &" still works by simply spawning a process and immediately
319 prompting for next command (or executing next command in a script), 292 prompting for next command (or executing next command in a script),
320 but no separate process group is formed. 293 but no separate process group is formed.
Line 321... Line 294...
321   294  
322 config BUSYBOX_CONFIG_HUSH_TICK 295 config BUSYBOX_CONFIG_HUSH_TICK
323 bool "Support command substitution" 296 bool "Support process substitution"
324 default BUSYBOX_DEFAULT_HUSH_TICK 297 default BUSYBOX_DEFAULT_HUSH_TICK
325 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH 298 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
326 help 299 help
Line 403... Line 376...
403 default BUSYBOX_DEFAULT_HUSH_EXPORT_N 376 default BUSYBOX_DEFAULT_HUSH_EXPORT_N
404 depends on BUSYBOX_CONFIG_HUSH_EXPORT 377 depends on BUSYBOX_CONFIG_HUSH_EXPORT
405 help 378 help
406 export -n unexports variables. It is a bash extension. 379 export -n unexports variables. It is a bash extension.
Line 407... Line -...
407   -  
408 config BUSYBOX_CONFIG_HUSH_READONLY -  
409 bool "readonly builtin" -  
410 default BUSYBOX_DEFAULT_HUSH_READONLY -  
411 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH -  
412 help -  
413 Enable support for read-only variables. -  
414   380  
415 config BUSYBOX_CONFIG_HUSH_KILL 381 config BUSYBOX_CONFIG_HUSH_KILL
416 bool "kill builtin (supports kill %jobspec)" 382 bool "kill builtin (supports kill %jobspec)"
417 default BUSYBOX_DEFAULT_HUSH_KILL 383 default BUSYBOX_DEFAULT_HUSH_KILL
Line 418... Line 384...
418 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH 384 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
419   385  
420 config BUSYBOX_CONFIG_HUSH_WAIT 386 config BUSYBOX_CONFIG_HUSH_WAIT
421 bool "wait builtin" 387 bool "wait builtin"
Line 422... Line -...
422 default BUSYBOX_DEFAULT_HUSH_WAIT -  
423 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH -  
424   -  
425 config BUSYBOX_CONFIG_HUSH_COMMAND -  
426 bool "command builtin" -  
427 default BUSYBOX_DEFAULT_HUSH_COMMAND 388 default BUSYBOX_DEFAULT_HUSH_WAIT
428 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH 389 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
429   390  
430 config BUSYBOX_CONFIG_HUSH_TRAP 391 config BUSYBOX_CONFIG_HUSH_TRAP
Line 431... Line 392...
431 bool "trap builtin" 392 bool "trap builtin"
432 default BUSYBOX_DEFAULT_HUSH_TRAP 393 default BUSYBOX_DEFAULT_HUSH_TRAP
433 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH 394 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
434   395  
Line 435... Line -...
435 config BUSYBOX_CONFIG_HUSH_TYPE -  
436 bool "type builtin" -  
437 default BUSYBOX_DEFAULT_HUSH_TYPE -  
438 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH -  
439   -  
440 config BUSYBOX_CONFIG_HUSH_TIMES 396 config BUSYBOX_CONFIG_HUSH_TYPE
441 bool "times builtin" 397 bool "type builtin"
442 default BUSYBOX_DEFAULT_HUSH_TIMES 398 default BUSYBOX_DEFAULT_HUSH_TYPE
443 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH 399 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
Line 465... Line 421...
465 config BUSYBOX_CONFIG_HUSH_UMASK 421 config BUSYBOX_CONFIG_HUSH_UMASK
466 bool "umask builtin" 422 bool "umask builtin"
467 default BUSYBOX_DEFAULT_HUSH_UMASK 423 default BUSYBOX_DEFAULT_HUSH_UMASK
468 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH 424 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
Line 469... Line -...
469   -  
470 config BUSYBOX_CONFIG_HUSH_GETOPTS -  
471 bool "getopts builtin" -  
472 default BUSYBOX_DEFAULT_HUSH_GETOPTS -  
473 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH -  
474   425  
475 config BUSYBOX_CONFIG_HUSH_MEMLEAK 426 config BUSYBOX_CONFIG_HUSH_MEMLEAK
476 bool "memleak builtin (debugging)" 427 bool "memleak builtin (debugging)"
477 default BUSYBOX_DEFAULT_HUSH_MEMLEAK 428 default BUSYBOX_DEFAULT_HUSH_MEMLEAK
Line -... Line 429...
-   429 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
-   430  
-   431 config BUSYBOX_CONFIG_MSH
-   432 bool "msh (deprecated: aliased to hush)"
-   433 default BUSYBOX_DEFAULT_MSH
-   434 select BUSYBOX_CONFIG_HUSH
-   435 help
Line 478... Line 436...
478 depends on BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH 436 msh is deprecated and will be removed, please migrate to hush.
479   437  
Line 480... Line 438...
480   438  
Line 541... Line 499...
541 This may significantly speed up some shell scripts. 499 This may significantly speed up some shell scripts.
Line 542... Line 500...
542   500  
543 This feature is relatively new. Use with care. Report bugs 501 This feature is relatively new. Use with care. Report bugs
Line 544... Line -...
544 to project mailing list. -  
545   -  
546 config BUSYBOX_CONFIG_FEATURE_SH_READ_FRAC -  
547 bool "read -t N.NNN support (+110 bytes)" -  
548 default BUSYBOX_DEFAULT_FEATURE_SH_READ_FRAC -  
549 depends on BUSYBOX_CONFIG_ASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_ASH || BUSYBOX_CONFIG_BASH_IS_ASH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH -  
550 help -  
551 Enable support for fractional second timeout in read builtin. 502 to project mailing list.
552   503  
553 config BUSYBOX_CONFIG_FEATURE_SH_HISTFILESIZE 504 config BUSYBOX_CONFIG_FEATURE_SH_HISTFILESIZE
554 bool "Use $HISTFILESIZE" 505 bool "Use $HISTFILESIZE"
555 default BUSYBOX_DEFAULT_FEATURE_SH_HISTFILESIZE 506 default BUSYBOX_DEFAULT_FEATURE_SH_HISTFILESIZE
556 depends on BUSYBOX_CONFIG_ASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_ASH || BUSYBOX_CONFIG_BASH_IS_ASH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH 507 depends on BUSYBOX_CONFIG_ASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_ASH || BUSYBOX_CONFIG_BASH_IS_ASH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH
557 help 508 help
558 This option makes busybox shells to use $HISTFILESIZE variable 509 This option makes busybox shells to use $HISTFILESIZE variable
Line 559... Line -...
559 to set shell history size. Note that its max value is capped -  
560 by "History size" setting in library tuning section. -  
561   -  
562 config BUSYBOX_CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS -  
563 bool "Embed scripts in the binary" -  
564 default BUSYBOX_DEFAULT_FEATURE_SH_EMBEDDED_SCRIPTS -  
565 depends on BUSYBOX_CONFIG_ASH || BUSYBOX_CONFIG_HUSH || BUSYBOX_CONFIG_SH_IS_ASH || BUSYBOX_CONFIG_BASH_IS_ASH || BUSYBOX_CONFIG_SH_IS_HUSH || BUSYBOX_CONFIG_BASH_IS_HUSH -  
566 help -  
567 Allow scripts to be compressed and embedded in the busybox -  
568 binary. The scripts should be placed in the 'embed' directory -  
569 at build time. Like applets, scripts can be run as -  
570 'busybox SCRIPT ...' or by linking their name to the binary. -  
571   -  
572 This also allows applets to be implemented as scripts: place -  
573 the script in 'applets_sh' and a stub C file containing 510 to set shell history size. Note that its max value is capped
Line 574... Line 511...
574 configuration in the appropriate subsystem directory. 511 by "History size" setting in library tuning section.