public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Michal Marek <mmarek@suse.cz>
To: paulmck@linux.vnet.ibm.com
Cc: linux-kernel@vger.kernel.org, zippel@linux-m68k.org,
	mingo@elte.hu, akpm@linux-foundation.org,
	torvalds@linux-foundation.org, geert@linux-m68k.org,
	elendil@planet.nl, cloos@jhcloos.com
Subject: Re: [PATCH 0/2] v4 kconfig: place git SHA1 in .config output if in SCM
Date: Mon, 08 Mar 2010 16:01:23 +0100	[thread overview]
Message-ID: <4B951143.1050807@suse.cz> (raw)
In-Reply-To: <20100305194305.GA23009@linux.vnet.ibm.com>

On 5.3.2010 20:43, Paul E. McKenney wrote:
> This patch appends the localversion string to the Linux kernel version.
> For example, in a git tree with uncommitted changes, the .config file
> might start as follows (but with leading hash marks):
> 
> 	Automatically generated make config: don't edit
> 	Linux kernel version: 2.6.33-01836-g90a6501-dirty
> 	Mon Mar  1 17:05:59 2010
> 
> The "-01836-g90a6501-dirty" string is added by this patch.

kbuild in linux-next already has
commit 85a256d8e0116c8f5ad276730830f5d4d473344d
Author: David Rientjes <rientjes@google.com>
Date:   Wed Jan 13 13:01:05 2010 -0800

    kbuild: improve version string logic

which results in a scripts/setlocalversion call during each build. And
with CONFIG_LOCALVERSION_AUTO, it stores exactly the string you want in
include/config/kernel.release. So we could change kconfig to read that
file instead of building the version string again. To also cover the
!CONFIG_LOCALVERSION_AUTO case, we can add a
include/config/kernel.release.full file to hold the full string each time.

Sorry for jumping in so late in the discussion, I had a bit of backlog
in mail directed to me and linux-kbuild@vger.kernel.org, let alone LKML ;).

Michal

  parent reply	other threads:[~2010-03-08 15:01 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-03-05 19:43 [PATCH 0/2] v4 kconfig: place git SHA1 in .config output if in SCM Paul E. McKenney
2010-03-05 19:44 ` [PATCH tip/core/rcu 1/2] kconfig: place localversion string in .config output Paul E. McKenney
2010-03-05 19:44   ` [PATCH tip/core/rcu 2/2] kconfig: make setlocalversion -dirty check optional Paul E. McKenney
2010-03-08 15:01 ` Michal Marek [this message]
2010-03-11  2:59   ` [PATCH 0/2] v4 kconfig: place git SHA1 in .config output if in SCM Paul E. McKenney

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=4B951143.1050807@suse.cz \
    --to=mmarek@suse.cz \
    --cc=akpm@linux-foundation.org \
    --cc=cloos@jhcloos.com \
    --cc=elendil@planet.nl \
    --cc=geert@linux-m68k.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@elte.hu \
    --cc=paulmck@linux.vnet.ibm.com \
    --cc=torvalds@linux-foundation.org \
    --cc=zippel@linux-m68k.org \
    /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