tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

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

Linus Torvalds 9a459f68 090b710e

+1 -2
unified split
-1
Makefile
··· 189 189 # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile 190 190 export KBUILD_BUILDHOST := $(SUBARCH) 191 191 ARCH ?= $(SUBARCH) 192 - CROSS_COMPILE ?= 193 192 CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%) 194 193 195 194 # Architecture as present in compile.h
+1 -1
scripts/setlocalversion
··· 86 86 87 87 # Check for mercurial and a mercurial repo. 88 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 91 # Do we have an untagged version? 92 92 if [ -z "$tag" -o "$tag" = tip ]; then