Re: kbuild, localversion (Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files)

2007-02-14 Thread Sam Ravnborg
> > What i currently have is: > > -- top file 'Linux.version', with first line: > > 3.0.0-rcX > which can be parsed to fill variables, used in build process (how many > `.' and/or `-' in it -- doesn't really matter), second line is the name; > > -- 'MM.version' for MM tree; > > --

Re: kbuild, localversion (Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files)

2007-02-14 Thread Sam Ravnborg
What i currently have is: -- top file 'Linux.version', with first line: 3.0.0-rcX which can be parsed to fill variables, used in build process (how many `.' and/or `-' in it -- doesn't really matter), second line is the name; -- 'MM.version' for MM tree; -- '[a-z]*\.version' for

kbuild, localversion (Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files)

2007-02-13 Thread Oleg Verych
Hallo! On Tue, Feb 13, 2007 at 05:09:47PM +0100, Roman Zippel wrote: > Hi, > > On Tue, 13 Feb 2007, Linus Torvalds wrote: > > > > I know it maybe another my "change it all" proposition, but i can't find > > > nothing against `GNU $(wildcard ..)' and `unnecessarily complex "find"'. > > > > It's

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-13 Thread Roman Zippel
Hi, On Tue, 13 Feb 2007, Linus Torvalds wrote: > > I know it maybe another my "change it all" proposition, but i can't find > > nothing against `GNU $(wildcard ..)' and `unnecessarily complex "find"'. > > It's the regexp in both cases. $(wildcard ) doesn't do regexp's (only the > normal path

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-13 Thread Linus Torvalds
On Tue, 13 Feb 2007, Oleg Verych wrote: > > I mean, all by-hand modifications must be in the $(srctree) (let's get > this term), $(objtree) is output *only*. No. Especially for things like localversion, the object tree (if it is different) is very much where you'd put that marker. You might

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-13 Thread Gerd Hoffmann
Hi, > I mean, all by-hand modifications must be in the $(srctree) (let's get > this term), $(objtree) is output *only*. Thus, i would propose to remove > it from the path. Even dynamic SCM mechanism of adding local version > doesn't use `localversion' files. I use localversion-$foo files in

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-13 Thread Gerd Hoffmann
Hi, I mean, all by-hand modifications must be in the $(srctree) (let's get this term), $(objtree) is output *only*. Thus, i would propose to remove it from the path. Even dynamic SCM mechanism of adding local version doesn't use `localversion' files. I use localversion-$foo files in both

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-13 Thread Linus Torvalds
On Tue, 13 Feb 2007, Oleg Verych wrote: I mean, all by-hand modifications must be in the $(srctree) (let's get this term), $(objtree) is output *only*. No. Especially for things like localversion, the object tree (if it is different) is very much where you'd put that marker. You might

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-13 Thread Roman Zippel
Hi, On Tue, 13 Feb 2007, Linus Torvalds wrote: I know it maybe another my change it all proposition, but i can't find nothing against `GNU $(wildcard ..)' and `unnecessarily complex find'. It's the regexp in both cases. $(wildcard ) doesn't do regexp's (only the normal path rules), and

kbuild, localversion (Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files)

2007-02-13 Thread Oleg Verych
Hallo! On Tue, Feb 13, 2007 at 05:09:47PM +0100, Roman Zippel wrote: Hi, On Tue, 13 Feb 2007, Linus Torvalds wrote: I know it maybe another my change it all proposition, but i can't find nothing against `GNU $(wildcard ..)' and `unnecessarily complex find'. It's the regexp in

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-12 Thread Oleg Verych
[] > > The old code did the same thing, but with the "make" $(sort ..) function, > > which apparently removes duplicates. We should use "sort -u" here. > > Heh. Why one ever going to bloat $(srctree) to add more "dontdiff" and > such, where build is supporting dirty output? I mean, all by-hand

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-12 Thread Oleg Verych
On Mon, Feb 12, 2007 at 02:53:29PM -0800, Linus Torvalds wrote: Hallo. > On Mon, 12 Feb 2007, Tony Luck wrote: > > > > Git bisect fingers this patch (which is in Linus' tree as commit > > 76c329563c5b8663ef27eb1bd195885ab826cbd0) as the culprit > > for double adding the contents of the

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-12 Thread Linus Torvalds
On Mon, 12 Feb 2007, Tony Luck wrote: > > Git bisect fingers this patch (which is in Linus' tree as commit > 76c329563c5b8663ef27eb1bd195885ab826cbd0) as the culprit > for double adding the contents of the localversion file. E.g. > > $ echo -tiger-smp > localversion > $ make prepare > $ make

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-12 Thread Tony Luck
On 2/5/07, Oleg Verych <[EMAIL PROTECTED]> wrote: kbuild: correctly skip tilded backups in localversion files Tildes as in path as in filenames are handled correctly now: only files, containing tilde '~', are backups, thus are not valid. Git bisect fingers this patch (which is in Linus'

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-12 Thread Tony Luck
On 2/5/07, Oleg Verych [EMAIL PROTECTED] wrote: kbuild: correctly skip tilded backups in localversion files Tildes as in path as in filenames are handled correctly now: only files, containing tilde '~', are backups, thus are not valid. Git bisect fingers this patch (which is in Linus' tree

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-12 Thread Linus Torvalds
On Mon, 12 Feb 2007, Tony Luck wrote: Git bisect fingers this patch (which is in Linus' tree as commit 76c329563c5b8663ef27eb1bd195885ab826cbd0) as the culprit for double adding the contents of the localversion file. E.g. $ echo -tiger-smp localversion $ make prepare $ make

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-12 Thread Oleg Verych
On Mon, Feb 12, 2007 at 02:53:29PM -0800, Linus Torvalds wrote: Hallo. On Mon, 12 Feb 2007, Tony Luck wrote: Git bisect fingers this patch (which is in Linus' tree as commit 76c329563c5b8663ef27eb1bd195885ab826cbd0) as the culprit for double adding the contents of the localversion

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-12 Thread Oleg Verych
[] The old code did the same thing, but with the make $(sort ..) function, which apparently removes duplicates. We should use sort -u here. Heh. Why one ever going to bloat $(srctree) to add more dontdiff and such, where build is supporting dirty output? I mean, all by-hand modifications

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-07 Thread Oleg Verych
On Wed, Feb 07, 2007 at 03:39:38PM +0100, Roman Zippel wrote: > Hi, > > On Tue, 6 Feb 2007, Oleg Verych wrote: > > > -nullstring := > > -space := $(nullstring) # end of line > > +pattern = ".*/localversion[^~]*" > > +string = $(shell cat /dev/null \ > > + `find $(objtree) $(srctree)

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-07 Thread Roman Zippel
Hi, On Tue, 6 Feb 2007, Oleg Verych wrote: > -nullstring := > -space := $(nullstring) # end of line > +pattern = ".*/localversion[^~]*" > +string = $(shell cat /dev/null \ > +`find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort`) Calling find here is overkill, if the

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-07 Thread Roman Zippel
Hi, On Tue, 6 Feb 2007, Oleg Verych wrote: -nullstring := -space := $(nullstring) # end of line +pattern = .*/localversion[^~]* +string = $(shell cat /dev/null \ +`find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort`) Calling find here is overkill, if the same can

Re: [patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-07 Thread Oleg Verych
On Wed, Feb 07, 2007 at 03:39:38PM +0100, Roman Zippel wrote: Hi, On Tue, 6 Feb 2007, Oleg Verych wrote: -nullstring := -space := $(nullstring) # end of line +pattern = .*/localversion[^~]* +string = $(shell cat /dev/null \ + `find $(objtree) $(srctree) -maxdepth 1

[patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-05 Thread Oleg Verych
kbuild: correctly skip tilded backups in localversion files Tildes as in path as in filenames are handled correctly now: only files, containing tilde '~', are backups, thus are not valid. [KJ]: Definition of `space' was removed, scripts/Kbuild.include has one. That definition was taken

[patch 3/3, resend] kbuild: correctly skip tilded backups in localversion files

2007-02-05 Thread Oleg Verych
kbuild: correctly skip tilded backups in localversion files Tildes as in path as in filenames are handled correctly now: only files, containing tilde '~', are backups, thus are not valid. [KJ]: Definition of `space' was removed, scripts/Kbuild.include has one. That definition was taken