X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=42655ab29ada5e284ef6a8f1193a83feab8f61fa;hp=8a2ecc6e1b5ab59d1e8a7f2b3f5504b8f0d79231;hb=de0ccf8f8c9fc6b695f45a3fdcf0a85c3b3d5299;hpb=89b102b3cb672c8f56ad6d8ff240acdab306f88a

diff --git a/make.sh b/make.sh
index 8a2ecc6e1b..42655ab29a 100755
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.15"							# Version number
-CORE="82"							# Core Level (Filename)
-PAKFIRE_CORE="82"						# Core Level (PAKFIRE)
+VERSION="2.17"							# Version number
+CORE="87-rc1"							# Core Level (Filename)
+PAKFIRE_CORE="86"						# 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=7
+TOOLCHAINVER=8
 
 # New architecture variables
 BUILD_ARCH="$(uname -m)"
@@ -408,56 +408,47 @@ buildipfire() {
 	i586)
 		# x86-pae (Native and new XEN) kernel build
 		ipfiremake linux			KCFG="-pae"
-#		ipfiremake kvm-kmod			KCFG="-pae"
-#		ipfiremake v4l-dvb			KCFG="-pae"
-#		ipfiremake mISDN			KCFG="-pae"
+		ipfiremake backports			KCFG="-pae"
 		ipfiremake cryptodev			KCFG="-pae"
-#		ipfiremake compat-drivers		KCFG="-pae"
-#		ipfiremake r8169			KCFG="-pae"
-#		ipfiremake r8168			KCFG="-pae"
-#		ipfiremake r8101			KCFG="-pae"
 		ipfiremake e1000e			KCFG="-pae"
 		ipfiremake igb				KCFG="-pae"
+		ipfiremake ixgbe			KCFG="-pae"
+		ipfiremake linux-initrd			KCFG="-pae"
 
 		# x86 kernel build
 		ipfiremake linux			KCFG=""
-#		ipfiremake kvm-kmod			KCFG=""
-#		ipfiremake v4l-dvb			KCFG=""
-#		ipfiremake mISDN			KCFG=""
+		ipfiremake backports			KCFG=""
 		ipfiremake cryptodev			KCFG=""
-#		ipfiremake compat-drivers		KCFG=""
-#		ipfiremake r8169			KCFG=""
-#		ipfiremake r8168			KCFG=""
-#		ipfiremake r8101			KCFG=""
 		ipfiremake e1000e			KCFG=""
 		ipfiremake igb				KCFG=""
+		ipfiremake ixgbe			KCFG=""
+		ipfiremake linux-initrd			KCFG=""
 		;;
 
 	armv5tel)
 		# arm-rpi (Raspberry Pi) kernel build
 		ipfiremake linux			KCFG="-rpi"
-#		ipfiremake v4l-dvb			KCFG="-rpi"
-#		ipfiremake mISDN			KCFG="-rpi" NOPCI=1
+		ipfiremake backports			KCFG="-rpi"
 		ipfiremake cryptodev			KCFG="-rpi"
-#		ipfiremake compat-drivers		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"
+		ipfiremake linux-initrd			KCFG="-multi"
 
 		# arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
 		ipfiremake linux			KCFG="-kirkwood"
-#		ipfiremake v4l-dvb			KCFG="-kirkwood"
-#		ipfiremake mISDN			KCFG="-kirkwood"
+		ipfiremake backports			KCFG="-kirkwood"
 		ipfiremake cryptodev			KCFG="-kirkwood"
-#		ipfiremake compat-drivers		KCFG="-kirkwood"
-#		ipfiremake r8169			KCFG="-kirkwood"
-#		ipfiremake r8168			KCFG="-kirkwood"
-#		ipfiremake r8101			KCFG="-kirkwood"
-#		ipfiremake e1000e			KCFG="-kirkwood"
+		ipfiremake e1000e			KCFG="-kirkwood"
 		ipfiremake igb				KCFG="-kirkwood"
+		ipfiremake ixgbe			KCFG="-kirkwood"
+		ipfiremake linux-initrd			KCFG="-kirkwood"
 		;;
   esac
   ipfiremake pkg-config
@@ -742,9 +733,11 @@ buildipfire() {
   ipfiremake iftop
   ipfiremake motion
   ipfiremake joe
+  ipfiremake monit
   ipfiremake nut
   ipfiremake watchdog
   ipfiremake libpri
+  ipfiremake libsrtp
   ipfiremake asterisk
   ipfiremake lcr
   ipfiremake usb_modeswitch
@@ -817,6 +810,8 @@ buildipfire() {
   ipfiremake perl-PDF-API2
   ipfiremake squid-accounting
   ipfiremake pigz
+  ipfiremake tmux
+  ipfiremake swconfig
 }
 
 buildinstaller() {