diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 17:57:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-08-13 17:57:56 -0700 |
| commit | 9a459f6812fc26e0eb24bbe9c388000e23f67f6b (patch) | |
| tree | c79cf75032eb432a5e9bc7c4b366267f32843416 | |
| parent | 090b710e8a0b7fe6f4752c5a439261f955075ebc (diff) | |
| parent | 55c640c3abff301eed5ee11c34a40bfe043c8c2d (diff) | |
| download | linux-9a459f6812fc26e0eb24bbe9c388000e23f67f6b.tar.bz2 | |
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
| -rw-r--r-- | Makefile | 1 | ||||
| -rwxr-xr-x | scripts/setlocalversion | 2 |
2 files changed, 1 insertions, 2 deletions
@@ -189,7 +189,6 @@ SUBARCH := $(shell uname -m | sed -e s/i.86/i386/ -e s/sun4u/sparc64/ \ # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile export KBUILD_BUILDHOST := $(SUBARCH) ARCH ?= $(SUBARCH) -CROSS_COMPILE ?= CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%) # Architecture as present in compile.h 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 |