diff options
| -rw-r--r-- | Documentation/kbuild/kconfig.txt | 5 | ||||
| -rw-r--r-- | scripts/kconfig/confdata.c | 12 |
2 files changed, 1 insertions, 16 deletions
diff --git a/Documentation/kbuild/kconfig.txt b/Documentation/kbuild/kconfig.txt index cca46b1a0f6c..c313d71324b4 100644 --- a/Documentation/kbuild/kconfig.txt +++ b/Documentation/kbuild/kconfig.txt | |||
| @@ -48,11 +48,6 @@ KCONFIG_OVERWRITECONFIG | |||
| 48 | If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not | 48 | If you set KCONFIG_OVERWRITECONFIG in the environment, Kconfig will not |
| 49 | break symlinks when .config is a symlink to somewhere else. | 49 | break symlinks when .config is a symlink to somewhere else. |
| 50 | 50 | ||
| 51 | KCONFIG_NOTIMESTAMP | ||
| 52 | -------------------------------------------------- | ||
| 53 | If this environment variable exists and is non-null, the timestamp line | ||
| 54 | in generated .config files is omitted. | ||
| 55 | |||
| 56 | ______________________________________________________________________ | 51 | ______________________________________________________________________ |
| 57 | Environment variables for '{allyes/allmod/allno/rand}config' | 52 | Environment variables for '{allyes/allmod/allno/rand}config' |
| 58 | 53 | ||
diff --git a/scripts/kconfig/confdata.c b/scripts/kconfig/confdata.c index 834eecb010ba..2bafd9a7c8da 100644 --- a/scripts/kconfig/confdata.c +++ b/scripts/kconfig/confdata.c | |||
| @@ -560,8 +560,6 @@ int conf_write(const char *name) | |||
| 560 | const char *basename; | 560 | const char *basename; |
| 561 | const char *str; | 561 | const char *str; |
| 562 | char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1]; | 562 | char dirname[PATH_MAX+1], tmpname[PATH_MAX+1], newname[PATH_MAX+1]; |
| 563 | time_t now; | ||
| 564 | int use_timestamp = 1; | ||
| 565 | char *env; | 563 | char *env; |
| 566 | 564 | ||
| 567 | dirname[0] = 0; | 565 | dirname[0] = 0; |
| @@ -598,19 +596,11 @@ int conf_write(const char *name) | |||
| 598 | if (!out) | 596 | if (!out) |
| 599 | return 1; | 597 | return 1; |
| 600 | 598 | ||
| 601 | time(&now); | ||
| 602 | env = getenv("KCONFIG_NOTIMESTAMP"); | ||
| 603 | if (env && *env) | ||
| 604 | use_timestamp = 0; | ||
| 605 | |||
| 606 | fprintf(out, _("#\n" | 599 | fprintf(out, _("#\n" |
| 607 | "# Automatically generated make config: don't edit\n" | 600 | "# Automatically generated make config: don't edit\n" |
| 608 | "# %s\n" | 601 | "# %s\n" |
| 609 | "%s%s" | ||
| 610 | "#\n"), | 602 | "#\n"), |
| 611 | rootmenu.prompt->text, | 603 | rootmenu.prompt->text); |
| 612 | use_timestamp ? "# " : "", | ||
| 613 | use_timestamp ? ctime(&now) : ""); | ||
| 614 | 604 | ||
| 615 | if (!conf_get_changed()) | 605 | if (!conf_get_changed()) |
| 616 | sym_clear_all_valid(); | 606 | sym_clear_all_valid(); |
