The patch titled
kbuild: don't ignore localversion files if the path includes a ~
has been added to the -mm tree. Its filename is
kbuild-dont-ignore-localversion-files-if-the-path-includes-a.patch
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: kbuild: don't ignore localversion files if the path includes a ~
From: Bastian Blank <bastian@xxxxxxxxxxxx>
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 <sam@xxxxxxxxxxxx>
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
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)) \
_
Patches currently in -mm which might be from bastian@xxxxxxxxxxxx are
kbuild-dont-ignore-localversion-files-if-the-path-includes-a.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
