From: Arne Fitzenreiter <arne_f@ipfire.org>
Date: Wed, 1 Aug 2012 06:56:54 +0000 (+0200)
Subject: Merge remote-tracking branch 'ms/ccache-update' into kernel-update
X-Git-Url: http://git.ipfire.org/?p=people%2Fteissler%2Fipfire-2.x.git;a=commitdiff_plain;h=4503e6b7ad857ceb87b7d6fe02e1952d911634bb;hp=-c

Merge remote-tracking branch 'ms/ccache-update' into kernel-update
---

4503e6b7ad857ceb87b7d6fe02e1952d911634bb
diff --combined make.sh
index 84447f5e9,8f4eed0b2..8e44c4d79
--- a/make.sh
+++ b/make.sh
@@@ -26,7 -26,7 +26,7 @@@ NAME="IPFire"							# Software nam
  SNAME="ipfire"							# Short name
  VERSION="2.11"							# Version number
  CORE="61"							# Core Level (Filename)
- PAKFIRE_CORE="60"						# Core Level (PAKFIRE)
+ PAKFIRE_CORE="61"						# Core Level (PAKFIRE)
  GIT_BRANCH=`git status | head -n1 | cut -d" " -f4`		# Git Branch
  SLOGAN="www.ipfire.org"						# Software slogan
  CONFIG_ROOT=/var/ipfire						# Configuration rootdir
@@@ -222,7 -222,7 +222,7 @@@ prepareenv() 
      # Run LFS static binary creation scripts one by one
      export CCACHE_DIR=$BASEDIR/ccache
      export CCACHE_COMPRESS=1
-     export CCACHE_HASHDIR=1
+     export CCACHE_COMPILERCHECK="none"
  
      # Remove pre-install list of installed files in case user erase some files before rebuild
      rm -f $BASEDIR/build/usr/src/lsalr 2>/dev/null
@@@ -265,7 -265,11 +265,7 @@@ buildtoolchain() 
      lfsmake1 binutils	PASS=1
      lfsmake1 gcc		PASS=1
      export PATH=$BASEDIR/build/usr/local/bin:$BASEDIR/build/tools/bin:$PATH
 -    if [ "${MACHINE_TYPE}" = "arm" ]; then
 -        lfsmake1 linux TOOLS=1 HEADERS=1
 -    else
 -        lfsmake1 linux-libc-header
 -    fi
 +    lfsmake1 linux TOOLS=1 HEADERS=1
      lfsmake1 glibc
      lfsmake1 cleanup-toolchain PASS=1
      lfsmake1 fake-environ
@@@ -302,7 -306,11 +302,7 @@@ buildbase() 
      LOGFILE="$BASEDIR/log/_build.base.log"
      export LOGFILE
      lfsmake2 stage2
 -    if [ "${MACHINE_TYPE}" = "arm" ]; then
 -        lfsmake2 linux HEADERS=1
 -    else
 -        lfsmake2 linux-libc-header
 -    fi
 +    lfsmake2 linux HEADERS=1
      lfsmake2 man-pages
      lfsmake2 glibc
      lfsmake2 tzdata
@@@ -376,7 -384,6 +376,7 @@@ buildipfire() 
    ipfiremake xz
    ipfiremake linux-firmware
    ipfiremake zd1211-firmware
 +  ipfiremake rpi-firmware
    ipfiremake fw_ath9k_htc
    ipfiremake u-boot
  
@@@ -429,11 -436,6 +429,11 @@@
      ipfiremake e1000e			KCFG=""
      ipfiremake igb			KCFG=""
    else
 +    # arm-omap kernel build
 +    ipfiremake linux3			KCFG="-rpi"
 +
 +    ipfiremake linux3			KCFG="-omap"
 +
      # arm-versatile kernel build
      ipfiremake linux			KCFG="-versatile"
      ipfiremake v4l-dvb			KCFG="-versatile"
diff --combined tools/make-functions
index b6e0ff3c3,0753865f5..545068939
--- a/tools/make-functions
+++ b/tools/make-functions
@@@ -225,7 -225,7 +225,7 @@@ if [ 'x86_64' = $MACHINE -o 'i686' = $M
  	CXXFLAGS="-O2 -march=i586 -pipe -fomit-frame-pointer"
  	C2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer"
  	CXX2FLAGS="-O2 -march=i586 -mtune=i586 -pipe -fomit-frame-pointer"
 -elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE -o 'armv7l' = $MACHINE ]; then
 +elif [ 'armv5tejl' = $MACHINE -o 'armv5tel' = $MACHINE -o 'armv6l' = $MACHINE -o 'armv7l' = $MACHINE ]; then
  	echo "`date -u '+%b %e %T'`: Machine is ARM (or equivalent)" >> $LOGFILE
  	MACHINE=armv5tel
  	MACHINE_TYPE=arm
@@@ -298,7 -298,7 +298,7 @@@ entershell() 
  		CFLAGS="$CF2LAGS" CXXFLAGS="$CXX2FLAGS" \
  		CCACHE_DIR=/usr/src/ccache \
  		CCACHE_COMPRESS=1 \
- 		CCACHE_HASHDIR=1 \
+ 		CCACHE_COMPILERCHECK="none" \
  		KVER=$KVER \
  		BUILDTARGET="$BUILDTARGET" \
  		MACHINE="$MACHINE" \
@@@ -415,7 -415,8 +415,8 @@@ lfsmake2() 
  						CONFIG_ROOT=$CONFIG_ROOT \
  						NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
  						CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
- 						CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
+ 						CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
+ 						CCACHE_COMPILERCHECK="none" \
  						KVER=$KVER MAKETUNING=$MAKETUNING \
  						BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
  						MACHINE_TYPE="$MACHINE_TYPE" \
@@@ -448,7 -449,8 +449,8 @@@ ipfiremake() 
  						CONFIG_ROOT=$CONFIG_ROOT \
  						NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
  						CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
- 						CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
+ 						CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
+ 						CCACHE_COMPILERCHECK="none" \
  						KVER=$KVER MAKETUNING=$MAKETUNING \
  						BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
  						MACHINE_TYPE="$MACHINE_TYPE" \
@@@ -480,7 -482,8 +482,8 @@@ ipfiredist() 
  					CONFIG_ROOT=$CONFIG_ROOT \
  					NAME="$NAME" SNAME="$SNAME" SLOGAN="$SLOGAN" \
  					CFLAGS="$C2FLAGS" CXXFLAGS="$CXX2FLAGS" \
- 					CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 CCACHE_HASHDIR=1 \
+ 					CCACHE_DIR=/usr/src/ccache CCACHE_COMPRESS=1 \
+ 					CCACHE_COMPILERCHECK="none" \
  					KVER=$KVER \
  					BUILDTARGET="$BUILDTARGET" MACHINE="$MACHINE" \
  					MACHINE_TYPE="$MACHINE_TYPE" \