From: Linus Torvalds <torvalds@woody.linux-foundation.org>
Date: Mon, 12 Feb 2007 23:05:15 +0000 (-0800)
Subject: don't use 'localversion*' files twice
X-Git-Tag: v2.6.21-rc1~274^2~2
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=fd19e44f449f7e2e58d42d7bb6813e2292c38fba;p=linux-2.6-omap-h63xx.git

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>
---

diff --git a/Makefile b/Makefile
index cdeda68cf2a..7e4968fb213 100644
--- a/Makefile
+++ b/Makefile
@@ -789,7 +789,7 @@ $(vmlinux-dirs): prepare scripts
 
 pattern = ".*/localversion[^~]*"
 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) \
 			      $(patsubst "%",%,$(CONFIG_LOCALVERSION)))