diff options
| author |   Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 00:35:51 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@evo.osdl.org> | 2005-09-06 00:35:51 -0700 |
| commit | ef88b7dba2b47c70037a34a599d383462bb74bd3 (patch) | |
| tree | f50afe82c446cbf93893880878b97339fbdb8f49 /init/Kconfig | |
| parent | Merge master.kernel.org:/pub/scm/linux/kernel/git/gregkh/driver-2.6 (diff) | |
| parent | [PATCH] kbuild: automatically append a short string to the version based upon the git commit (diff) | |
| download | linux-dev-ef88b7dba2b47c70037a34a599d383462bb74bd3.tar.xz linux-dev-ef88b7dba2b47c70037a34a599d383462bb74bd3.zip | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/sam/kbuild
Diffstat (limited to 'init/Kconfig')
| -rw-r--r-- | init/Kconfig | 22 |
1 files changed, 20 insertions, 2 deletions
diff --git a/init/Kconfig b/init/Kconfig index 05a75c4f5ce2..d5a1a1228fab 100644 --- a/init/Kconfig +++ b/init/Kconfig @@ -77,6 +77,22 @@ config LOCALVERSION object and source tree, in that order. Your total string can be a maximum of 64 characters. +config LOCALVERSION_AUTO + bool "Automatically append version information to the version string" + default y + help + This will try to automatically determine if the current tree is a + release tree by looking for git tags that + belong to the current top of tree revision. + + A string of the format -gxxxxxxxx will be added to the localversion + if a git based tree is found. The string generated by this will be + appended after any matching localversion* files, and after the value + set in CONFIG_LOCALVERSION + + Note: This requires Perl, and a git repository, but not necessarily + the git or cogito tools to be installed. + config SWAP bool "Support for paging of anonymous memory (swap)" depends on MMU @@ -238,6 +254,8 @@ config CPUSETS Say N if unsure. +source "usr/Kconfig" + menuconfig EMBEDDED bool "Configure standard kernel features (for small systems)" help @@ -260,8 +278,8 @@ config KALLSYMS_ALL help Normally kallsyms only contains the symbols of functions, for nicer OOPS messages. Some debuggers can use kallsyms for other - symbols too: say Y here to include all symbols, and you - don't care about adding 300k to the size of your kernel. + symbols too: say Y here to include all symbols, if you need them + and you don't care about adding 300k to the size of your kernel. Say N. |