(trimming cc: down a bit) On Thu, Mar 10, 2005 at 06:40:11AM +0100, Sam Ravnborg wrote: > On Wed, Mar 09, 2005 at 06:25:56PM -0800, Linus Torvalds wrote: > > On Thu, 10 Mar 2005, Benjamin Herrenschmidt wrote: > > > BTW, Linus: Any chance you ever change something to version or > > > extraversion in bk just after a release ? I know I already ask and it > > > degenerated into a flamefest, and I don't know if that is specifically > > > the case now, but I keep getting report of people saying "I have a bug > > > in 2.6.xx" while in fact, they have some kind of bk clone of sometime > > > after 2.6.xx... > > > > The answer is the same: I'd still like to have somebody (preferably Sam) > > who is comfortable with all the build scripts get a revision-control- > > specific version at build-time, so that BK users would get the top-of-tree > > key value, and other people could get some CVS revision or something. > > I have a patch somewhere in my inbox, and got one from Ryan yesterday > also. I will see if I during the weekend find some time to look at it.
Sam, you'll probably want this on top of the patch I sent. (I haven't built in a clean tree in a while, found a minor problem when I was transitioning to quilt today.) When running scripts/setlocalversion.sh, use $(CONFIG_SHELL) so the executable bit doesn't need to be set. Signed-off-by: Ryan Anderson <[EMAIL PROTECTED]> Index: local-quilt/Makefile =================================================================== --- local-quilt.orig/Makefile 2005-03-12 20:36:24.000000000 -0500 +++ local-quilt/Makefile 2005-03-12 20:54:40.000000000 -0500 @@ -563,7 +563,7 @@ ifeq ($(CONFIG_LOCALVERSION_AUTO),y) ifeq ($(shell ls -d $(srctree)/BitKeeper 2>/dev/null),$(srctree)/BitKeeper) - localversion-bk := $(shell $(srctree)/scripts/setlocalversion.sh $(srctree) $(objtree)) + localversion-bk := $(shell $(CONFIG_SHELL) $(srctree)/scripts/setlocalversion.sh $(srctree) $(objtree)) LOCALVERSION := $(LOCALVERSION)$(localversion-bk) endif endif -- Ryan Anderson sometimes Pug Majere - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to [EMAIL PROTECTED] More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/