Gitweb:     
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=fd19e44f449f7e2e58d42d7bb6813e2292c38fba
Commit:     fd19e44f449f7e2e58d42d7bb6813e2292c38fba
Parent:     ebaf0c6032f525ddb0158fb59848d41899dce8cd
Author:     Linus Torvalds <[EMAIL PROTECTED]>
AuthorDate: Mon Feb 12 15:05:15 2007 -0800
Committer:  Linus Torvalds <[EMAIL PROTECTED]>
CommitDate: Mon Feb 12 15:05:15 2007 -0800

    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 <[EMAIL PROTECTED]>
    Signed-off-by: Linus Torvalds <[EMAIL PROTECTED]>
---
 Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/Makefile b/Makefile
index cdeda68..7e4968f 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)))
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Reply via email to