[PATCH] kbuild: Don't ignore localversion files if the path includes a ~

From: Bastian Blank
Date: Wed Jan 10 2007 - 06:43:48 EST


Hi Kai, Sam

The following patch fixes the problem that localversion files where
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.

--- a/Makefile
+++ b/Makefile
@@ -807,7 +807,7 @@ space := $(nullstring) # end of line
___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)) \

--
Totally illogical, there was no chance.
-- Spock, "The Galileo Seven", stardate 2822.3

Attachment: signature.asc
Description: Digital signature