diff --git a/[refs] b/[refs] index 2d4ffc1c8701..bb78e95b7562 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: eda890af7959a79ab10a7a8ae979dadcdba41c58 +refs/heads/master: 6e5a5420b7cdac356efbdc7832e90a805670b889 diff --git a/trunk/init/Kconfig b/trunk/init/Kconfig index b170aa1d43bd..29d9e47ee0da 100644 --- a/trunk/init/Kconfig +++ b/trunk/init/Kconfig @@ -80,16 +80,20 @@ config LOCALVERSION_AUTO 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. + 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 + 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 + set in CONFIG_LOCALVERSION. - Note: This requires Perl, and a git repository, but not necessarily - the git or cogito tools to be installed. + (The actual string used here is the first eight characters produced + by running the command: + + $ git rev-parse --verify HEAD + + which is done within the script "scripts/setlocalversion".) config SWAP bool "Support for paging of anonymous memory (swap)"