X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=38e9229350432d0bd9ec4937d9988770ba0050bd;hb=d731b1f9914738ba8c76f7724b7915c941d3e336;hp=0a74a21aa63abf333e573b439db8efc667ecb5b3;hpb=cfac8f9476678259698b14463fdd0c1b3ffeff23;p=ipfire-2.x.git

diff --git a/make.sh b/make.sh
index 0a74a21aa6..38e9229350 100755
--- a/make.sh
+++ b/make.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007-2015 IPFire Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2016 IPFire Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.17"							# Version number
-CORE="96"							# Core Level (Filename)
-PAKFIRE_CORE="95"						# Core Level (PAKFIRE)
+CORE="100"							# Core Level (Filename)
+PAKFIRE_CORE="99"						# Core Level (PAKFIRE)
 GIT_BRANCH=`git rev-parse --abbrev-ref HEAD`			# Git Branch
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
@@ -36,7 +36,7 @@ BUILD_IMAGES=1							# Flash and Xen Downloader
 KVER=`grep --max-count=1 VER lfs/linux | awk '{ print $3 }'`
 GIT_TAG=$(git tag | tail -1)					# Git Tag
 GIT_LASTCOMMIT=$(git log | head -n1 | cut -d" " -f2 |head -c8)	# Last commit
-TOOLCHAINVER=10
+TOOLCHAINVER=11
 
 # New architecture variables
 BUILD_ARCH="$(uname -m)"
@@ -221,7 +221,7 @@ prepareenv() {
     # Run LFS static binary creation scripts one by one
     export CCACHE_DIR=$BASEDIR/ccache
     export CCACHE_COMPRESS=1
-    export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER}:${TARGET_ARCH}"
+    export CCACHE_COMPILERCHECK="string:toolchain-${TOOLCHAINVER} ${TARGET_ARCH}"
 
     # 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
@@ -287,6 +287,7 @@ buildtoolchain() {
     lfsmake1 linux			TOOLS=1 KCFG="-headers"
     lfsmake1 glibc
     lfsmake1 cleanup-toolchain		PASS=1
+    lfsmake1 gcc			PASS=L
     lfsmake1 binutils			PASS=2
     lfsmake1 gcc			PASS=2
     lfsmake1 ccache			PASS=2
@@ -330,6 +331,7 @@ buildbase() {
     lfsmake2 gmp
     lfsmake2 gmp-compat
     lfsmake2 mpfr
+    lfsmake2 libmpc
     lfsmake2 file
     lfsmake2 gcc
     lfsmake2 sed
@@ -398,7 +400,9 @@ buildipfire() {
   ipfiremake unzip
   ipfiremake which
   ipfiremake linux-firmware
+  ipfiremake ath10k-firmware
   ipfiremake dvb-firmwares
+  ipfiremake mt7601u-firmware
   ipfiremake zd1211-firmware
   ipfiremake rpi-firmware
   ipfiremake bc
@@ -422,7 +426,6 @@ buildipfire() {
 	x86_64)
 		ipfiremake linux			KCFG=""
 		ipfiremake backports			KCFG=""
-		ipfiremake cryptodev			KCFG=""
 		ipfiremake e1000e			KCFG=""
 		ipfiremake igb				KCFG=""
 		ipfiremake ixgbe			KCFG=""
@@ -433,7 +436,6 @@ buildipfire() {
 		# x86-pae (Native and new XEN) kernel build
 		ipfiremake linux			KCFG="-pae"
 		ipfiremake backports			KCFG="-pae"
-		ipfiremake cryptodev			KCFG="-pae"
 		ipfiremake e1000e			KCFG="-pae"
 		ipfiremake igb				KCFG="-pae"
 		ipfiremake ixgbe			KCFG="-pae"
@@ -443,7 +445,6 @@ buildipfire() {
 		# x86 kernel build
 		ipfiremake linux			KCFG=""
 		ipfiremake backports			KCFG=""
-		ipfiremake cryptodev			KCFG=""
 		ipfiremake e1000e			KCFG=""
 		ipfiremake igb				KCFG=""
 		ipfiremake ixgbe			KCFG=""
@@ -455,14 +456,12 @@ buildipfire() {
 		# arm-rpi (Raspberry Pi) kernel build
 		ipfiremake linux			KCFG="-rpi"
 		ipfiremake backports			KCFG="-rpi"
-		ipfiremake cryptodev			KCFG="-rpi"
 		ipfiremake xtables-addons		KCFG="-rpi"
 		ipfiremake linux-initrd			KCFG="-rpi"
 
 		# arm multi platform (Panda, Wandboard ...) kernel build
 		ipfiremake linux			KCFG="-multi"
 		ipfiremake backports			KCFG="-multi"
-		ipfiremake cryptodev			KCFG="-multi"
 		ipfiremake e1000e			KCFG="-multi"
 		ipfiremake igb				KCFG="-multi"
 		ipfiremake ixgbe			KCFG="-multi"
@@ -472,7 +471,6 @@ buildipfire() {
 		# arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
 		ipfiremake linux			KCFG="-kirkwood"
 		ipfiremake backports			KCFG="-kirkwood"
-		ipfiremake cryptodev			KCFG="-kirkwood"
 		ipfiremake e1000e			KCFG="-kirkwood"
 		ipfiremake igb				KCFG="-kirkwood"
 		ipfiremake ixgbe			KCFG="-kirkwood"
@@ -685,7 +683,6 @@ buildipfire() {
   ipfiremake ncftp
   ipfiremake etherwake
   ipfiremake bwm-ng
-  ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
   ipfiremake strongswan
@@ -753,7 +750,7 @@ buildipfire() {
   ipfiremake streamripper
   ipfiremake sshfs
   ipfiremake taglib
-  ipfiremake mediatomb
+  #ipfiremake mediatomb
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake perl-Sort-Naturally
@@ -851,6 +848,9 @@ buildipfire() {
   ipfiremake swconfig
   ipfiremake haproxy
   ipfiremake ipset
+  ipfiremake lua
+  ipfiremake dnsdist
+  ipfiremake bird
 }
 
 buildinstaller() {