summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2010-08-13 17:57:56 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2010-08-13 17:57:56 -0700
commit9a459f6812fc26e0eb24bbe9c388000e23f67f6b (patch)
treec79cf75032eb432a5e9bc7c4b366267f32843416
parent090b710e8a0b7fe6f4752c5a439261f955075ebc (diff)
parent55c640c3abff301eed5ee11c34a40bfe043c8c2d (diff)
downloadop-kernel-dev-9a459f6812fc26e0eb24bbe9c388000e23f67f6b.zip
op-kernel-dev-9a459f6812fc26e0eb24bbe9c388000e23f67f6b.tar.gz
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--Makefile1
-rwxr-xr-xscripts/setlocalversion2
2 files changed, 1 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 7431c28..788111d 100644
--- a/Makefile
+++ b/Makefile
@@ -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 64a9cb5..e90a91c 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
OpenPOWER on IntegriCloud