Prev: 2.6.35-rc3 - WARNING:iwl_set_dynamic_key
Next: [PATCH] Staging: memrar: Moved memrar_allocator struct into memrar_allocator.c
From: Michal Marek on 14 Jun 2010 08:20
On 14.6.2010 11:41, Andy Whitcroft wrote:
> In the commit below the version string handling was modified, adding
> a '+' where no other version information was supplied:
>
> commit 85a256d8e0116c8f5ad276730830f5d4d473344d
> Author: David Rientjes <rientjes(a)google.com>
> Date: Wed Jan 13 13:01:05 2010 -0800
>
> From the commit the intent was as below:
>
> - when CONFIG_LOCALVERSION_AUTO is disabled, a `+' is appended if the
> repository has been revised beyond a tagged commit and LOCALVERSION=
> was not passed to "make".
>
> However if the user supplies an empty LOCALVERSION on the command line
> the plus suffix is still added. This form is useful in the case where
> the build environment knows that the version as specified is correct and
> complete but does not correspond to a specific tag.
>
> This patch changes the implementation to match the documentation
> such that specifying LOCALVERSION= on the build line is sufficient
> to suppress any suffix.
>
> Signed-off-by: Andy Whitcroft <apw(a)canonical.com>
> ---
> Makefile | 2 +-
> 1 files changed, 1 insertions(+), 1 deletions(-)
>
> diff --git a/Makefile b/Makefile
> index d49d96c..662e820 100644
> --- a/Makefile
> +++ b/Makefile
> @@ -944,7 +944,7 @@ ifdef CONFIG_LOCALVERSION_AUTO
> localver-extra = $(scm-identifier)
> else
> ifneq ($(scm-identifier),)
> - ifeq ($(LOCALVERSION),)
> + ifeq ("$(origin LOCALVERSION)", "undefined")
> localver-extra = +
> endif
> endif

David, do you Ack this change? To me this seems like a reasonable
compromise.

Michal

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo(a)vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
 | 
Pages: 1
Prev: 2.6.35-rc3 - WARNING:iwl_set_dynamic_key
Next: [PATCH] Staging: memrar: Moved memrar_allocator struct into memrar_allocator.c