aboutsummaryrefslogtreecommitdiffstats
path: root/scripts
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-13 20:57:56 -0400
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-13 20:57:56 -0400
commit9a459f6812fc26e0eb24bbe9c388000e23f67f6b (patch)
treec79cf75032eb432a5e9bc7c4b366267f32843416 /scripts
parent090b710e8a0b7fe6f4752c5a439261f955075ebc (diff)
parent55c640c3abff301eed5ee11c34a40bfe043c8c2d (diff)
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: setlocalversion: fix version for untaged nontip mercurial revs Fix CONFIG_CROSS_COMPILE issue in .config
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/setlocalversion2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/setlocalversion b/scripts/setlocalversion
index 64a9cb5556cd..e90a91cc5185 100755
--- a/scripts/setlocalversion
+++ b/scripts/setlocalversion
@@ -86,7 +86,7 @@ scm_version()
86 86
87 # Check for mercurial and a mercurial repo. 87 # Check for mercurial and a mercurial repo.
88 if hgid=`hg id 2>/dev/null`; then 88 if hgid=`hg id 2>/dev/null`; then
89 tag=`printf '%s' "$hgid" | cut -d' ' -f2` 89 tag=`printf '%s' "$hgid" | cut -s -d' ' -f2`
90 90
91 # Do we have an untagged version? 91 # Do we have an untagged version?
92 if [ -z "$tag" -o "$tag" = tip ]; then 92 if [ -z "$tag" -o "$tag" = tip ]; then