On Wed, Jan 31, 2007 at 03:56:51PM -0800, Andrew Morton wrote: > On Wed, 31 Jan 2007 07:11:04 +0000 > Oleg Verych <[EMAIL PROTECTED]> wrote: > > > kbuild: correctly skip tilded backups in localversion files > > Does this patch replace Bastian's patch, below?
Along with "Message-ID: <[EMAIL PROTECTED]>" -- yes. Note, that they also make a little bit of cleanup to top makefile's mess, And, i think, have more elegant, portable, clean solution. Roman commented on another my patch, saying, that tilde in the end isn't the only way to name backups. Filename, containing '~' is a backup in the sources, thus i'm proposing new patch. Unfortunately still no more comments from anybody. Roman joined, but seems busy now, to comment on such minor stuff. Anyway, thanks. > From: Bastian Blank <[EMAIL PROTECTED]> > > Fix the problem that localversion files were ignored if the tree lives in > a path which contains a ~. It changes the test to apply to the filename > only. > > Debian allows versions which contains ~ in it. The upstream part of the > version is in the directory name of the build tree and we got weird results > because the localversion files was just got ignored in this case. > > Cc: Sam Ravnborg <[EMAIL PROTECTED]> > Cc: Roman Zippel <[EMAIL PROTECTED]> > Signed-off-by: Andrew Morton <[EMAIL PROTECTED]> > --- > > Makefile | 2 +- > 1 files changed, 1 insertion(+), 1 deletion(-) > > diff -puN > Makefile~kbuild-dont-ignore-localversion-files-if-the-path-includes-a Makefile > --- a/Makefile~kbuild-dont-ignore-localversion-files-if-the-path-includes-a > +++ a/Makefile > @@ -793,7 +793,7 @@ space := $(nullstring) # end of lin > ___localver = $(objtree)/localversion* $(srctree)/localversion* > __localver = $(sort $(wildcard $(___localver))) > # skip backup files (containing '~') > -_localver = $(foreach f, $(__localver), $(if $(findstring ~, $(f)),,$(f))) > +_localver = $(foreach f, $(__localver), $(if $(findstring ~, $(notdir > $(f))),,$(f))) > > localver = $(subst $(space),, \ > $(shell cat /dev/null $(_localver)) \ > _ > - 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/
