Skip to contentSkip to conversation

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

PATCH New Bastian Blank 1 participant 1 message Jan 10, 2007 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 kbuild: Don't ignore localversion files if the path includes a ~

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.

Makefile +1 -1
@@ -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)) \
Signature · 2 lines
Totally illogical, there was no chance.
		-- Spock, "The Galileo Seven", stardate 2822.3