X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=11be8465eca284e9a556ac9135d8f77bb3328142;hp=d080c059d954083738e0259b0beb6bebc5352350;hb=ad1204e4eb397b4f7d10c3bdfa9214aa8c0a0575;hpb=1e9c3fb2741c4d93650229befc5dea19139ff5da

diff --git a/make.sh b/make.sh
index d080c059d9..11be8465ec 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.19"							# Version number
-CORE="110"							# Core Level (Filename)
-PAKFIRE_CORE="110"						# Core Level (PAKFIRE)
+CORE="116"							# Core Level (Filename)
+PAKFIRE_CORE="116"						# 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,8 @@ 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=12
+
+TOOLCHAINVER=20170705
 
 # New architecture variables
 HOST_ARCH="$(uname -m)"
@@ -389,6 +390,7 @@ buildbase() {
     lfsmake2 udev
     lfsmake2 vim
     lfsmake2 xz
+    lfsmake2 paxctl
 }
 
 buildipfire() {
@@ -493,7 +495,10 @@ buildipfire() {
   lfsmake2 nettle
   lfsmake2 libevent
   lfsmake2 libevent2
+  lfsmake2 libevent2-compat
   lfsmake2 expat
+  lfsmake2 apr
+  lfsmake2 aprutil
   lfsmake2 unbound
   lfsmake2 gnutls
   lfsmake2 bind
@@ -524,7 +529,6 @@ buildipfire() {
   lfsmake2 libart
   lfsmake2 gd
   lfsmake2 popt
-  lfsmake2 pcre
   lfsmake2 slang
   lfsmake2 newt
   lfsmake2 libsmooth
@@ -544,6 +548,7 @@ buildipfire() {
   lfsmake2 web-user-interface
   lfsmake2 flag-icons
   lfsmake2 jquery
+  lfsmake2 bootstrap
   lfsmake2 arping
   lfsmake2 beep
   lfsmake2 dvdrtools
@@ -617,12 +622,12 @@ buildipfire() {
   lfsmake2 python-ipaddress
   lfsmake2 glib
   lfsmake2 GeoIP
-  lfsmake2 fwhits
   lfsmake2 noip_updater
   lfsmake2 ntp
   lfsmake2 openssh
   lfsmake2 fontconfig
   lfsmake2 dejavu-fonts-ttf
+  lfsmake2 ubuntu-font-family
   lfsmake2 freefont
   lfsmake2 pixman
   lfsmake2 cairo
@@ -651,8 +656,8 @@ buildipfire() {
   lfsmake2 intltool
   lfsmake2 libdaemon
   lfsmake2 cups
-  lfsmake2 ghostscript
   lfsmake2 lcms2
+  lfsmake2 ghostscript
   lfsmake2 qpdf
   lfsmake2 poppler
   lfsmake2 cups-filters
@@ -703,7 +708,6 @@ buildipfire() {
   lfsmake2 gnu-netcat
   lfsmake2 ncat
   lfsmake2 nmap
-  lfsmake2 ncftp
   lfsmake2 etherwake
   lfsmake2 bwm-ng
   lfsmake2 sysstat
@@ -737,12 +741,10 @@ buildipfire() {
   lfsmake2 icinga
   lfsmake2 ebtables
   lfsmake2 directfb
-  lfsmake2 dfb++
   lfsmake2 faad2
   lfsmake2 ffmpeg
   lfsmake2 vdr
   lfsmake2 vdr_streamdev
-  lfsmake2 vdr_vnsiserver5
   lfsmake2 vdr_epgsearch
   lfsmake2 vdr_dvbapi
   lfsmake2 vdr_eepg
@@ -791,7 +793,6 @@ buildipfire() {
   lfsmake2 cacti
   lfsmake2 openvmtools
   lfsmake2 nagiosql
-  lfsmake2 iftop
   lfsmake2 motion
   lfsmake2 joe
   lfsmake2 monit
@@ -807,7 +808,6 @@ buildipfire() {
   lfsmake2 pound
   lfsmake2 minicom
   lfsmake2 ddrescue
-  lfsmake2 imspector
   lfsmake2 miniupnpd
   lfsmake2 client175
   lfsmake2 powertop
@@ -826,7 +826,6 @@ buildipfire() {
   lfsmake2 dpfhack
   lfsmake2 lcd4linux
   lfsmake2 mtr
-  lfsmake2 tcpick
   lfsmake2 minidlna
   lfsmake2 acpid
   lfsmake2 fping
@@ -867,6 +866,8 @@ buildipfire() {
   lfsmake2 owncloud
   lfsmake2 bacula
   lfsmake2 batctl
+  lfsmake2 perl-Font-TTF
+  lfsmake2 perl-IO-String
   lfsmake2 perl-PDF-API2
   lfsmake2 squid-accounting
   lfsmake2 pigz
@@ -885,10 +886,13 @@ buildipfire() {
   lfsmake2 libpciaccess
   lfsmake2 libyajl
   lfsmake2 libvirt
+  lfsmake2 python3-libvirt
   lfsmake2 freeradius
   lfsmake2 perl-common-sense
   lfsmake2 perl-inotify2
   lfsmake2 perl-Net-IP
+  lfsmake2 wio
+  lfsmake2 iftop
 }
 
 buildinstaller() {
@@ -897,7 +901,7 @@ buildinstaller() {
   export LOGFILE
   lfsmake2 memtest
   lfsmake2 installer
-  lfsmake2 strip
+  lfsmake1 strip
 }
 
 buildpackages() {
@@ -995,7 +999,7 @@ ipfirepackages() {
 while [ $# -gt 0 ]; do
 	case "${1}" in
 		--target=*)
-			configure_target "${1#--target=}"
+			configure_build "${1#--target=}"
 			;;
 		-*)
 			exiterror "Unknown configuration option: ${1}"
@@ -1016,7 +1020,7 @@ build)
 	#only restore on a clean disk
 	if [ ! -e "${BASEDIR}/build/tools/.toolchain-successful" ]; then
 		if [ ! -n "$PACKAGE" ]; then
-			beautify build_stage "Full toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
+			beautify build_stage "Full toolchain compilation"
 			prepareenv
 			buildtoolchain
 		else
@@ -1145,7 +1149,7 @@ downloadsrc)
 toolchain)
 	clear
 	prepareenv
-	beautify build_stage "Toolchain compilation - Native GCC: `gcc --version | grep GCC | awk {'print $3'}`"
+	beautify build_stage "Toolchain compilation"
 	buildtoolchain
 	echo "`date -u '+%b %e %T'`: Create toolchain tar.gz for ${BUILD_ARCH}" | tee -a $LOGFILE
 	test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains