diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-08-19 22:26:05 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-08-19 22:26:05 +0000 |
| commit | 625ed8e027e703c06a82bfbb8b4e8fd4876c7779 (patch) | |
| tree | d84e7107303e339853ac0389c99bd0a59762afd8 | |
| parent | c77e843c0927bc4235d6d54981bcf7fdaa9f0421 (diff) | |
| download | busybox-w32-625ed8e027e703c06a82bfbb8b4e8fd4876c7779.tar.gz busybox-w32-625ed8e027e703c06a82bfbb8b4e8fd4876c7779.tar.bz2 busybox-w32-625ed8e027e703c06a82bfbb8b4e8fd4876c7779.zip | |
Updating defconfig, fixing a typo in Config.in
| -rw-r--r-- | TODO_config_nommu | 6 | ||||
| -rw-r--r-- | console-tools/Config.in | 2 | ||||
| -rw-r--r-- | scripts/defconfig | 5 |
3 files changed, 10 insertions, 3 deletions
diff --git a/TODO_config_nommu b/TODO_config_nommu index 90bd5b24a..8e13e1fe5 100644 --- a/TODO_config_nommu +++ b/TODO_config_nommu | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Busybox version: 1.12.0.svn | 3 | # Busybox version: 1.12.0.svn |
| 4 | # Tue Aug 5 14:43:04 2008 | 4 | # Wed Aug 20 00:24:07 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_HAVE_DOT_CONFIG=y | 6 | CONFIG_HAVE_DOT_CONFIG=y |
| 7 | 7 | ||
| @@ -13,6 +13,7 @@ CONFIG_HAVE_DOT_CONFIG=y | |||
| 13 | # General Configuration | 13 | # General Configuration |
| 14 | # | 14 | # |
| 15 | CONFIG_DESKTOP=y | 15 | CONFIG_DESKTOP=y |
| 16 | # CONFIG_EXTRA_COMPAT is not set | ||
| 16 | CONFIG_FEATURE_ASSUME_UNICODE=y | 17 | CONFIG_FEATURE_ASSUME_UNICODE=y |
| 17 | CONFIG_FEATURE_BUFFERS_USE_MALLOC=y | 18 | CONFIG_FEATURE_BUFFERS_USE_MALLOC=y |
| 18 | # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set | 19 | # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set |
| @@ -281,8 +282,10 @@ CONFIG_RESIZE=y | |||
| 281 | CONFIG_FEATURE_RESIZE_PRINT=y | 282 | CONFIG_FEATURE_RESIZE_PRINT=y |
| 282 | CONFIG_SETCONSOLE=y | 283 | CONFIG_SETCONSOLE=y |
| 283 | CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y | 284 | CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y |
| 285 | CONFIG_SETFONT=y | ||
| 284 | CONFIG_SETKEYCODES=y | 286 | CONFIG_SETKEYCODES=y |
| 285 | CONFIG_SETLOGCONS=y | 287 | CONFIG_SETLOGCONS=y |
| 288 | CONFIG_SHOWKEY=y | ||
| 286 | 289 | ||
| 287 | # | 290 | # |
| 288 | # Debian Utilities | 291 | # Debian Utilities |
| @@ -520,6 +523,7 @@ CONFIG_FEATURE_MOUNT_FLAGS=y | |||
| 520 | CONFIG_FEATURE_MOUNT_FSTAB=y | 523 | CONFIG_FEATURE_MOUNT_FSTAB=y |
| 521 | CONFIG_PIVOT_ROOT=y | 524 | CONFIG_PIVOT_ROOT=y |
| 522 | CONFIG_RDATE=y | 525 | CONFIG_RDATE=y |
| 526 | CONFIG_RDEV=y | ||
| 523 | CONFIG_READPROFILE=y | 527 | CONFIG_READPROFILE=y |
| 524 | CONFIG_RTCWAKE=y | 528 | CONFIG_RTCWAKE=y |
| 525 | CONFIG_SCRIPT=y | 529 | CONFIG_SCRIPT=y |
diff --git a/console-tools/Config.in b/console-tools/Config.in index a08ee42f7..254e2f7c8 100644 --- a/console-tools/Config.in +++ b/console-tools/Config.in | |||
| @@ -118,6 +118,6 @@ config SHOWKEY | |||
| 118 | bool "showkey" | 118 | bool "showkey" |
| 119 | default n | 119 | default n |
| 120 | help | 120 | help |
| 121 | Shows keys presses. | 121 | Shows keys pressed. |
| 122 | 122 | ||
| 123 | endmenu | 123 | endmenu |
diff --git a/scripts/defconfig b/scripts/defconfig index a3e98a1ad..686974b74 100644 --- a/scripts/defconfig +++ b/scripts/defconfig | |||
| @@ -1,7 +1,7 @@ | |||
| 1 | # | 1 | # |
| 2 | # Automatically generated make config: don't edit | 2 | # Automatically generated make config: don't edit |
| 3 | # Busybox version: 1.12.0.svn | 3 | # Busybox version: 1.12.0.svn |
| 4 | # Tue Aug 5 14:44:22 2008 | 4 | # Wed Aug 20 00:19:25 2008 |
| 5 | # | 5 | # |
| 6 | CONFIG_HAVE_DOT_CONFIG=y | 6 | CONFIG_HAVE_DOT_CONFIG=y |
| 7 | 7 | ||
| @@ -13,6 +13,7 @@ CONFIG_HAVE_DOT_CONFIG=y | |||
| 13 | # General Configuration | 13 | # General Configuration |
| 14 | # | 14 | # |
| 15 | # CONFIG_DESKTOP is not set | 15 | # CONFIG_DESKTOP is not set |
| 16 | # CONFIG_EXTRA_COMPAT is not set | ||
| 16 | # CONFIG_FEATURE_ASSUME_UNICODE is not set | 17 | # CONFIG_FEATURE_ASSUME_UNICODE is not set |
| 17 | CONFIG_FEATURE_BUFFERS_USE_MALLOC=y | 18 | CONFIG_FEATURE_BUFFERS_USE_MALLOC=y |
| 18 | # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set | 19 | # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set |
| @@ -281,8 +282,10 @@ CONFIG_RESIZE=y | |||
| 281 | CONFIG_FEATURE_RESIZE_PRINT=y | 282 | CONFIG_FEATURE_RESIZE_PRINT=y |
| 282 | CONFIG_SETCONSOLE=y | 283 | CONFIG_SETCONSOLE=y |
| 283 | CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y | 284 | CONFIG_FEATURE_SETCONSOLE_LONG_OPTIONS=y |
| 285 | CONFIG_SETFONT=y | ||
| 284 | CONFIG_SETKEYCODES=y | 286 | CONFIG_SETKEYCODES=y |
| 285 | CONFIG_SETLOGCONS=y | 287 | CONFIG_SETLOGCONS=y |
| 288 | CONFIG_SHOWKEY=y | ||
| 286 | 289 | ||
| 287 | # | 290 | # |
| 288 | # Debian Utilities | 291 | # Debian Utilities |