X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=95748468e3b4056a851886cbadf3e40586f4e461;hp=95877a4d7f6e5d45f01748fe69481faf05d06d67;hb=764a3f1ff2384f34c592c311f5435a24eb6a53c8;hpb=4b046d735d28012d215276ea08272f298e1e8ba1

diff --git a/make.sh b/make.sh
index 95877a4d7f..95748468e3 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.17"							# Version number
-CORE="95"							# Core Level (Filename)
-PAKFIRE_CORE="94"						# Core Level (PAKFIRE)
+CORE="97"							# Core Level (Filename)
+PAKFIRE_CORE="96"						# 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
@@ -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
@@ -422,9 +424,8 @@ buildipfire() {
 	x86_64)
 		ipfiremake linux			KCFG=""
 		ipfiremake backports			KCFG=""
-		ipfiremake cryptodev			KCFG=""
 		ipfiremake e1000e			KCFG=""
-#		ipfiremake igb				KCFG=""
+		ipfiremake igb				KCFG=""
 		ipfiremake ixgbe			KCFG=""
 		ipfiremake xtables-addons		KCFG=""
 		ipfiremake linux-initrd			KCFG=""
@@ -433,9 +434,8 @@ 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 igb				KCFG="-pae"
 		ipfiremake ixgbe			KCFG="-pae"
 		ipfiremake xtables-addons		KCFG="-pae"
 		ipfiremake linux-initrd			KCFG="-pae"
@@ -443,9 +443,8 @@ buildipfire() {
 		# x86 kernel build
 		ipfiremake linux			KCFG=""
 		ipfiremake backports			KCFG=""
-		ipfiremake cryptodev			KCFG=""
 		ipfiremake e1000e			KCFG=""
-#		ipfiremake igb				KCFG=""
+		ipfiremake igb				KCFG=""
 		ipfiremake ixgbe			KCFG=""
 		ipfiremake xtables-addons		KCFG=""
 		ipfiremake linux-initrd			KCFG=""
@@ -455,16 +454,14 @@ 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 igb				KCFG="-multi"
 		ipfiremake ixgbe			KCFG="-multi"
 		ipfiremake xtables-addons		KCFG="-multi"
 		ipfiremake linux-initrd			KCFG="-multi"
@@ -472,9 +469,8 @@ 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 igb				KCFG="-kirkwood"
 		ipfiremake ixgbe			KCFG="-kirkwood"
 		ipfiremake xtables-addons		KCFG="-kirkwood"
 		ipfiremake linux-initrd			KCFG="-kirkwood"
@@ -685,7 +681,6 @@ buildipfire() {
   ipfiremake ncftp
   ipfiremake etherwake
   ipfiremake bwm-ng
-  ipfiremake tripwire
   ipfiremake sysstat
   ipfiremake vsftpd
   ipfiremake strongswan
@@ -753,7 +748,7 @@ buildipfire() {
   ipfiremake streamripper
   ipfiremake sshfs
   ipfiremake taglib
-  ipfiremake mediatomb
+  #ipfiremake mediatomb
   ipfiremake sslh
   ipfiremake perl-gettext
   ipfiremake perl-Sort-Naturally
@@ -850,6 +845,9 @@ buildipfire() {
   ipfiremake perl-Text-CSV_XS
   ipfiremake swconfig
   ipfiremake haproxy
+  ipfiremake ipset
+  ipfiremake lua
+  ipfiremake dnsdist
 }
 
 buildinstaller() {