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? 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/