GitHub-Mirror/Star64_linux
2
0
Fork 0
mirror of https://github.com/Fishwaldo/Star64_linux.git synced 2025-06-23 07:01:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6

Browse source 
* '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
This commit is contained in:
Linus Torvalds 2010-08-13 17:57:56 -07:00
commit 9a459f6812
2 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile
View file

@ -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 # Note: Some architectures assign CROSS_COMPILE in their arch/*/Makefile
export KBUILD_BUILDHOST := $(SUBARCH) export KBUILD_BUILDHOST := $(SUBARCH)
ARCH ?= $(SUBARCH) ARCH ?= $(SUBARCH)
CROSS_COMPILE ?=
CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%) CROSS_COMPILE ?= $(CONFIG_CROSS_COMPILE:"%"=%)
# Architecture as present in compile.h # Architecture as present in compile.h

2
scripts/setlocalversion
View file

@ -86,7 +86,7 @@ scm_version()
# Check for mercurial and a mercurial repo. # Check for mercurial and a mercurial repo.
if hgid=`hg id 2>/dev/null`; then 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? # Do we have an untagged version?
if [ -z "$tag" -o "$tag" = tip ]; then if [ -z "$tag" -o "$tag" = tip ]; then