public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Sam Ravnborg <sam@ravnborg.org>
To: Christoph Hellwig <hch@mx20.domainteam.dk>,
	sam@ravnborg.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH] read EXTRAVERSION from file
Date: Mon, 30 Aug 2004 18:18:54 +0200	[thread overview]
Message-ID: <20040830161854.GA24580@mars.ravnborg.org> (raw)
In-Reply-To: <20040830151405.GA18836@lst.de>

On Mon, Aug 30, 2004 at 05:14:05PM +0200, Christoph Hellwig wrote:
> The're an very interesting patch in the Debian tree still from the time
> where Herbert Xu mentioned it, it allows creating a file .extraversion
> in the toplevel kernel directory and the Makefile will set EXTRAVERSION
> to it's contents.  This has the nice advantage of keeping an
> extraversion pre-tree instead of having to patch the Makefile and
> getting rejects everytime you pull a new tree (or BK refuses to touch
> the Makefile).
> 
> The only thing I'm not fully comfortable is the .extraversion name, I
> think I'd prefer a user-visible name.
> 
> Any other comments on this one?
> 
> --- kernel-source-2.6.6/Makefile	2004-05-10 19:47:45.000000000 +1000
> +++ kernel-source-2.6.6-1/Makefile	2004-05-10 22:21:02.000000000 +1000
> @@ -151,6 +151,9 @@
>  
>  export srctree objtree VPATH TOPDIR
>  
> +ifeq ($(EXTRAVERSION),)
> +EXTRAVERSION := $(shell [ ! -f .extraversion ] || cat .extraversion)
> +endif
>  KERNELRELEASE=$(VERSION).$(PATCHLEVEL).$(SUBLEVEL)$(EXTRAVERSION)

This would fail for 2.6.8.1 for instance. Or at least the '1' that Linus 
added would be part of the final EXTRAVERSION.

Ian Wienand <ianw@gelato.unsw.edu.au> posted a patch some time ago that
introduces LOCALVERSION - it's in my queue but not applied since it
needs some rework. And documentation also.
That should be easy to extend to read the file localversion.

I would then prefer something like:
If exists $(srctree)/localversion read file and append to LOCALVERSION
If exists $(objtree)/localversion read file and append to LOCALVERSION


Example for a debian patched kernel src tree:

srctree:
localversion <= contains -deb-unstb-7.9
objtree:
localversion <= contains -smp-p4

Resulting in a kernelversion equals: 2.6.8-rc1-deb-unstb-7.9-smp-p4

	Sam

  parent reply	other threads:[~2004-08-30 16:17 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2004-08-30 15:14 [PATCH] read EXTRAVERSION from file Christoph Hellwig
2004-08-30 15:35 ` Muli Ben-Yehuda
2004-08-30 16:18 ` Sam Ravnborg [this message]
2004-08-31  6:20   ` Frank Steiner
2004-09-10 21:53 ` Matt Mackall
2004-09-10 22:11   ` Sam Ravnborg

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=20040830161854.GA24580@mars.ravnborg.org \
    --to=sam@ravnborg.org \
    --cc=hch@mx20.domainteam.dk \
    --cc=linux-kernel@vger.kernel.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