From: Michal Marek <mmarek@suse.cz>
To: Greg Thelen <gthelen@google.com>
Cc: David Rientjes <rientjes@google.com>, linux-kbuild@vger.kernel.org
Subject: Re: [PATCH] Fix checking of scm-identifier variable
Date: Thu, 6 May 2010 16:34:34 +0200 [thread overview]
Message-ID: <20100506143434.GA7129@sepie.suse.cz> (raw)
In-Reply-To: <xr93fx261c13.fsf_-_@ninji.mtv.corp.google.com>
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
parent reply other threads:[~2010-05-06 14:34 UTC|newest]
Thread overview: expand[flat|nested] mbox.gz Atom feed
[parent not found: <xr93fx261c13.fsf_-_@ninji.mtv.corp.google.com>]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100506143434.GA7129@sepie.suse.cz \
--to=mmarek@suse.cz \
--cc=gthelen@google.com \
--cc=linux-kbuild@vger.kernel.org \
--cc=rientjes@google.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).