diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 02:57:56 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-14 02:57:56 +0200 |
| commit | 9a459f6812fc26e0eb24bbe9c388000e23f67f6b (patch) | |
| tree | c79cf75032eb432a5e9bc7c4b366267f32843416 /scripts | |
| parent | Merge branch 'kconfig' of git://git.kernel.org/pub/scm/linux/kernel/git/mmare... (diff) | |
| parent | setlocalversion: fix version for untaged nontip mercurial revs (diff) | |
| download | linux-9a459f6812fc26e0eb24bbe9c388000e23f67f6b.tar.xz linux-9a459f6812fc26e0eb24bbe9c388000e23f67f6b.zip | |
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-x | scripts/setlocalversion | 2 |
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() # Check for mercurial and a mercurial repo. if hgid=`hg id 2>/dev/null`; then - tag=`printf '%s' "$hgid" | cut -d' ' -f2` + tag=`printf '%s' "$hgid" | cut -s -d' ' -f2` # Do we have an untagged version? if [ -z "$tag" -o "$tag" = tip ]; then |