Messages in this thread |  | | | Date | Fri, 08 Oct 2010 16:04:15 +0200 | | From | Michal Marek <> | | Subject | Re: [PATCH] Fix LOCALVERSION append plus logic |
| |
On 7.10.2010 22:18, alan.tull@freescale.com wrote: > 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+
That's a result of patching the kernel and thus moving away from the v2.6.35.3 tag.
> unpatched : Linux-2.6.35.3 > > CONFIG_LOCALVERSION="-something" > results: > patched : Linux-2.6.35.3-something > unpatched : Linux-2.6.35.3-something+
Dunno how you got this, was it really a clean 2.6.35.3?
> 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
CONFIG_LOCALVERSION does not play any role here, the documented way to disable the plus sign is the LOCALVERSION environment or make variable:
make LOCALVERSION= all
Michal
|  |