Messages in this thread Patch in this message | | | From | <> | Subject | [PATCH] Fix LOCALVERSION append plus logic | Date | Thu, 7 Oct 2010 15:18:52 -0500 |
| |
From: Alan Tull <alan.tull@freescale.com>
This change fixes the logic to do what the comment says when CONFIG_LOCALVERSION_AUTO and CONFIG_LOCALVERSION are both not set.
Also fix a spelling error in the comment.
If the kernel tree is in git, here's the config permutations (with CONFIG_LOCALVERSION_AUTO turned off) and the image name resulting:
CONFIG_LOCALVERSION="" results: patched : Linux-2.6.35.3+ unpatched : Linux-2.6.35.3
CONFIG_LOCALVERSION="-something" results: patched : Linux-2.6.35.3-something unpatched : Linux-2.6.35.3-something+
Signed-off-by: Alan Tull <alan.tull@freescale.com> --- scripts/setlocalversion | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/scripts/setlocalversion b/scripts/setlocalversion index 64a9cb5..4488a33 100755 --- a/scripts/setlocalversion +++ b/scripts/setlocalversion @@ -160,9 +160,9 @@ if test "$CONFIG_LOCALVERSION_AUTO" = "y"; then # full scm version string res="$res$(scm_version)" else - # apped a plus sign if the repository is not in a clean tagged + # append a plus sign if the repository is not in a clean tagged # state and LOCALVERSION= is not specified - if test "${LOCALVERSION+set}" != "set"; then + if test "$CONFIG_LOCALVERSION" = ""; then scm=$(scm_version --short) res="$res${scm:++}" fi -- 1.6.0.4
| |