The patch titled
kbuild: correctly skip tilded backups in localversion files
has been added to the -mm tree. Its filename is
kbuild-correctly-skip-tilded-backups-in-localversion-files.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: kbuild: correctly skip tilded backups in localversion files
From: Oleg Verych <olecom@xxxxxxxxxxxxxx>
Tildes as in path as in filenames are handled correctly now: only files,
containing tilde '~', are backups, thus are not valid.
Definition of `space' was removed, scripts/Kbuild.include has one. That
definition was taken right from the GNU make manual, while Kbuild's version is
original.
Original report by Bastian Blank:
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.
Cc: Roman Zippel <zippel@xxxxxxxxxxxxxx>
Cc: Bastian Blank <bastian@xxxxxxxxxxxx>
Cc: Sam Ravnborg <sam@xxxxxxxxxxxx>
Signed-off-by: Oleg Verych <olecom@xxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Makefile | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 deletions(-)
diff -puN Makefile~kbuild-correctly-skip-tilded-backups-in-localversion-files Makefile
--- a/Makefile~kbuild-correctly-skip-tilded-backups-in-localversion-files
+++ a/Makefile
@@ -776,7 +776,7 @@ $(vmlinux-dirs): prepare scripts
# $(EXTRAVERSION) eg, -rc6
# $(localver-full)
# $(localver)
-# localversion* (all localversion* files)
+# localversion* (files without backups, containing '~')
# $(CONFIG_LOCALVERSION) (from kernel config setting)
# $(localver-auto) (only if CONFIG_LOCALVERSION_AUTO is set)
# ./scripts/setlocalversion (SCM tag, if one exists)
@@ -787,17 +787,12 @@ $(vmlinux-dirs): prepare scripts
# moment, only git is supported but other SCMs can edit the script
# scripts/setlocalversion and add the appropriate checks as needed.
-nullstring :=
-space := $(nullstring) # end of line
+pattern = ".*/localversion[^~]*"
+string = $(shell cat /dev/null \
+ `find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort`)
-___localver = $(objtree)/localversion* $(srctree)/localversion*
-__localver = $(sort $(wildcard $(___localver)))
-# skip backup files (containing '~')
-_localver = $(foreach f, $(__localver), $(if $(findstring ~, $(f)),,$(f)))
-
-localver = $(subst $(space),, \
- $(shell cat /dev/null $(_localver)) \
- $(patsubst "%",%,$(CONFIG_LOCALVERSION)))
+localver = $(subst $(space),, $(string) \
+ $(patsubst "%",%,$(CONFIG_LOCALVERSION)))
# If CONFIG_LOCALVERSION_AUTO is set scripts/setlocalversion is called
# and if the SCM is know a tag from the SCM is appended.
_
Patches currently in -mm which might be from olecom@xxxxxxxxxxxxxx are
scripts-replace-gawk-head-bc-with-shell-update.patch
kbuild-improve-option-checking-kbuildinclude-cleanup.patch
kbuild-correctly-skip-tilded-backups-in-localversion-files.patch
deprecate-smbfs-in-favour-of-cifs-docs.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
