don't use 'localversion*' files twice
Since we look in both source and object directories for localversion* files, we accidentally ended up getting them twice. Use 'sort -u' to avoid that. Reported-by: Tony Luck <tony.luck@intel.com> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
ebaf0c6032
commit
fd19e44f44
2
Makefile
2
Makefile
@ -789,7 +789,7 @@ $(vmlinux-dirs): prepare scripts
|
|||||||
|
|
||||||
pattern = ".*/localversion[^~]*"
|
pattern = ".*/localversion[^~]*"
|
||||||
string = $(shell cat /dev/null \
|
string = $(shell cat /dev/null \
|
||||||
`find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort`)
|
`find $(objtree) $(srctree) -maxdepth 1 -regex $(pattern) | sort -u`)
|
||||||
|
|
||||||
localver = $(subst $(space),, $(string) \
|
localver = $(subst $(space),, $(string) \
|
||||||
$(patsubst "%",%,$(CONFIG_LOCALVERSION)))
|
$(patsubst "%",%,$(CONFIG_LOCALVERSION)))
|
||||||
|
Loading…
Reference in New Issue
Block a user