Merge commit 'origin/master' into next
authorArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Oct 2010 18:17:15 +0000 (20:17 +0200)
committerArne Fitzenreiter <arne_f@ipfire.org>
Fri, 22 Oct 2010 18:17:15 +0000 (20:17 +0200)
Conflicts:
src/paks/linux-pae/uninstall.sh

1  2 
make.sh

diff --cc make.sh
+++ b/make.sh
@@@ -37,7 -37,7 +37,7 @@@ KVER=`grep --max-count=1 VER lfs/linux 
  MACHINE=`uname -m`
  GIT_TAG=$(git tag | tail -1)                                  # Git Tag
  GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)        # Last commit
- TOOLCHAINVER=2
 -TOOLCHAINVER=3
++TOOLCHAINVER=1
  IPFVER="full"                         # Which versions should be compiled? (full|devel)
  
  # Debian specific settings