Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9a459f68 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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
parents 090b710e 55c640c3

Makefile

+0 −1
Original line number Diff line number Diff line
@@ -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

scripts/setlocalversion

+1 −1
Original line number Diff line number Diff line
@@ -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