* Re: [PATCH] Fix checking of scm-identifier variable
[not found] ` <xr93fx261c13.fsf_-_@ninji.mtv.corp.google.com>
@ 2010-05-06 14:34 ` Michal Marek
0 siblings, 0 replies; only message in thread
From: Michal Marek @ 2010-05-06 14:34 UTC (permalink / raw)
To: Greg Thelen; +Cc: David Rientjes, linux-kbuild
On Wed, May 05, 2010 at 10:41:44AM -0700, Greg Thelen wrote:
> Michal,
>
> I'm looking Makefile in the -mm branch (dated 2010-04-28-16-53) and
> seeing what looks like a bug in the checking of scm-identifier. The
> "ifneq ($scm-identifier)" seems to always execute "ifeq
> ($(LOCALVERSION,)) ...". This patch fixes the checking of
> scm-identifier.
Good catch, thanks!
Michal
> Signed-off-by: Greg Thelen <gthelen@google.com>
> Acked-by: David Rientjes <rientjes@google.com>
>
> ---
> Makefile | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index 6e8cc20..beeb757 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -943,7 +943,7 @@ endif
> ifdef CONFIG_LOCALVERSION_AUTO
> localver-extra = $(scm-identifier)
> else
> - ifneq ($scm-identifier,)
> + ifneq ($(scm-identifier),)
> ifeq ($(LOCALVERSION),)
> localver-extra = +
> endif
> --
> 1.7.0.1
>
> --
> Greg
^ permalink raw reply [flat|nested] only message in thread