aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDenys Vlasenko <vda.linux@googlemail.com>2015-10-25 20:36:03 +0100
committerDenys Vlasenko <vda.linux@googlemail.com>2015-10-25 20:36:03 +0100
commitdb700330d8951d96ea70102797041730c925eeeb (patch)
treec721e86bec9fa312cdb17470be8cbf54de866c04
parent0269789537c0c16de948e100ea331fdba54008e4 (diff)
downloadbusybox-w32-db700330d8951d96ea70102797041730c925eeeb.tar.gz
busybox-w32-db700330d8951d96ea70102797041730c925eeeb.tar.bz2
busybox-w32-db700330d8951d96ea70102797041730c925eeeb.zip
tweak defconfig
MONOTONIC_SYSCALL=y by default FEATURE_LAST_SMALL is gone: now FEATURE_LAST_FANCY is a "bool", not a "choice". Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r--archival/ar.c16
-rw-r--r--archival/bbunzip.c2
-rw-r--r--libbb/Config.src8
-rw-r--r--miscutils/Config.src16
4 files changed, 11 insertions, 31 deletions
diff --git a/archival/ar.c b/archival/ar.c
index f86c52d9b..e49d5cb2b 100644
--- a/archival/ar.c
+++ b/archival/ar.c
@@ -22,23 +22,13 @@
22//config: default n # needs to be improved to be able to replace binutils ar 22//config: default n # needs to be improved to be able to replace binutils ar
23//config: help 23//config: help
24//config: ar is an archival utility program used to create, modify, and 24//config: ar is an archival utility program used to create, modify, and
25//config: extract contents from archives. An archive is a single file holding 25//config: extract contents from archives. In practice, it is used exclusively
26//config: a collection of other files in a structure that makes it possible to 26//config: for object module archives used by compilers.
27//config: retrieve the original individual files (called archive members).
28//config: The original files' contents, mode (permissions), timestamp, owner,
29//config: and group are preserved in the archive, and can be restored on
30//config: extraction.
31//config: 27//config:
32//config: The stored filename is limited to 15 characters. (for more information
33//config: see long filename support).
34//config: ar has 60 bytes of overheads for every stored file.
35//config:
36//config: This implementation of ar can extract archives, it cannot create or
37//config: modify them.
38//config: On an x86 system, the ar applet adds about 1K. 28//config: On an x86 system, the ar applet adds about 1K.
39//config: 29//config:
40//config: Unless you have a specific application which requires ar, you should 30//config: Unless you have a specific application which requires ar, you should
41//config: probably say N here. 31//config: probably say N here: most compilers come with their own ar utility.
42//config: 32//config:
43//config:config FEATURE_AR_LONG_FILENAMES 33//config:config FEATURE_AR_LONG_FILENAMES
44//config: bool "Support for long filenames (not needed for debs)" 34//config: bool "Support for long filenames (not needed for debs)"
diff --git a/archival/bbunzip.c b/archival/bbunzip.c
index 90aac1427..548882f53 100644
--- a/archival/bbunzip.c
+++ b/archival/bbunzip.c
@@ -220,7 +220,7 @@ char* FAST_FUNC make_new_name_generic(char *filename, const char *expected_ext)
220 220
221//config:config UNCOMPRESS 221//config:config UNCOMPRESS
222//config: bool "uncompress" 222//config: bool "uncompress"
223//config: default n 223//config: default n # ancient
224//config: help 224//config: help
225//config: uncompress is used to decompress archives created by compress. 225//config: uncompress is used to decompress archives created by compress.
226//config: Not much used anymore, replaced by gzip/gunzip. 226//config: Not much used anymore, replaced by gzip/gunzip.
diff --git a/libbb/Config.src b/libbb/Config.src
index 19021fed1..b02ea14b0 100644
--- a/libbb/Config.src
+++ b/libbb/Config.src
@@ -16,7 +16,7 @@ config PASSWORD_MINLEN
16 16
17config MD5_SMALL 17config MD5_SMALL
18 int "MD5: Trade bytes for speed (0:fast, 3:slow)" 18 int "MD5: Trade bytes for speed (0:fast, 3:slow)"
19 default 1 19 default 1 # all "fast or small" options default to small
20 range 0 3 20 range 0 3
21 help 21 help
22 Trade binary size versus speed for the md5sum algorithm. 22 Trade binary size versus speed for the md5sum algorithm.
@@ -30,7 +30,7 @@ config MD5_SMALL
30 30
31config SHA3_SMALL 31config SHA3_SMALL
32 int "SHA3: Trade bytes for speed (0:fast, 1:slow)" 32 int "SHA3: Trade bytes for speed (0:fast, 1:slow)"
33 default 1 33 default 1 # all "fast or small" options default to small
34 range 0 1 34 range 0 1
35 help 35 help
36 Trade binary size versus speed for the sha3sum algorithm. 36 Trade binary size versus speed for the sha3sum algorithm.
@@ -40,7 +40,7 @@ config SHA3_SMALL
40 40
41config FEATURE_FAST_TOP 41config FEATURE_FAST_TOP
42 bool "Faster /proc scanning code (+100 bytes)" 42 bool "Faster /proc scanning code (+100 bytes)"
43 default y 43 default n # all "fast or small" options default to small
44 help 44 help
45 This option makes top (and ps) ~20% faster (or 20% less CPU hungry), 45 This option makes top (and ps) ~20% faster (or 20% less CPU hungry),
46 but code size is slightly bigger. 46 but code size is slightly bigger.
@@ -208,7 +208,7 @@ config FEATURE_SKIP_ROOTFS
208 208
209config MONOTONIC_SYSCALL 209config MONOTONIC_SYSCALL
210 bool "Use clock_gettime(CLOCK_MONOTONIC) syscall" 210 bool "Use clock_gettime(CLOCK_MONOTONIC) syscall"
211 default n 211 default y
212 select PLATFORM_LINUX 212 select PLATFORM_LINUX
213 help 213 help
214 Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring 214 Use clock_gettime(CLOCK_MONOTONIC) syscall for measuring
diff --git a/miscutils/Config.src b/miscutils/Config.src
index d69abf1a2..06f1c52ba 100644
--- a/miscutils/Config.src
+++ b/miscutils/Config.src
@@ -308,23 +308,13 @@ config LAST
308 help 308 help
309 'last' displays a list of the last users that logged into the system. 309 'last' displays a list of the last users that logged into the system.
310 310
311choice
312 prompt "Choose last implementation"
313 depends on LAST
314 default FEATURE_LAST_FANCY
315
316config FEATURE_LAST_SMALL
317 bool "small"
318 help
319 This is a small version of last with just the basic set of
320 features.
321
322config FEATURE_LAST_FANCY 311config FEATURE_LAST_FANCY
323 bool "huge" 312 bool "Turn on output of extra information"
313 default y
314 depends on LAST
324 help 315 help
325 'last' displays detailed information about the last users that 316 'last' displays detailed information about the last users that
326 logged into the system (mimics sysvinit last). +900 bytes. 317 logged into the system (mimics sysvinit last). +900 bytes.
327endchoice
328 318
329config HDPARM 319config HDPARM
330 bool "hdparm" 320 bool "hdparm"