X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=d6f6f71470e057c4fc057190ad6d41d1fbf957ac;hb=65650ec69be35b5372a7fdca3e74deb3fd433327;hp=0499dbafb72147f9fa05f2e9107be72fe9a3d2fe;hpb=15b005d8378df38938e11aebff0488095c771754;p=ipfire-2.x.git

diff --git a/make.sh b/make.sh
index 0499dbafb7..d6f6f71470 100755
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,10 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
+# If you update the version don't forget to update backupiso and add it to core update
 VERSION="2.23"							# Version number
-CORE="132"							# Core Level (Filename)
-PAKFIRE_CORE="131"						# Core Level (PAKFIRE)
+CORE="135"							# Core Level (Filename)
+PAKFIRE_CORE="134"						# 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
@@ -37,7 +38,7 @@ 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=20181030
+TOOLCHAINVER=20190427
 
 ###############################################################################
 #
@@ -468,7 +469,7 @@ prepareenv() {
 	mkdir -p "${BASEDIR}/build${TOOLS_DIR}" 2>/dev/null
 	mkdir -p $BASEDIR/build/{etc,usr/src} 2>/dev/null
 	mkdir -p $BASEDIR/build/{dev/{shm,pts},proc,sys}
-	mkdir -p $BASEDIR/{cache,ccache} 2>/dev/null
+	mkdir -p $BASEDIR/{cache,ccache/${BUILD_ARCH}} 2>/dev/null
 
 	if [ "${ENABLE_RAMDISK}" = "on" ]; then
 		mkdir -p $BASEDIR/build/usr/src
@@ -487,7 +488,7 @@ prepareenv() {
 	mount --bind /proc           $BASEDIR/build/proc
 	mount --bind /sys            $BASEDIR/build/sys
 	mount --bind $BASEDIR/cache  $BASEDIR/build/usr/src/cache
-	mount --bind $BASEDIR/ccache $BASEDIR/build/usr/src/ccache
+	mount --bind $BASEDIR/ccache/${BUILD_ARCH} $BASEDIR/build/usr/src/ccache
 	mount --bind $BASEDIR/config $BASEDIR/build/usr/src/config
 	mount --bind $BASEDIR/doc    $BASEDIR/build/usr/src/doc
 	mount --bind $BASEDIR/html   $BASEDIR/build/usr/src/html
@@ -519,6 +520,9 @@ prepareenv() {
 		SYSTEM_RELEASE="${SYSTEM_RELEASE} - Development Build: $GIT_BRANCH/$GIT_LASTCOMMIT$GIT_STATUS"
 		;;
 	esac
+
+	# Setup ccache cache size
+	enterchroot ccache --max-size="${CCACHE_CACHE_SIZE}" >/dev/null
 }
 
 enterchroot() {
@@ -733,7 +737,7 @@ fake_environ() {
 
 	# Fake kernel version, because some of the packages do not compile
 	# with kernel 3.0 and later.
-	env="${env} UTS_RELEASE=${KVER}"
+	env="${env} UTS_RELEASE=${KVER}-ipfire"
 
 	# Fake machine version.
 	env="${env} UTS_MACHINE=${BUILD_ARCH}"
@@ -899,6 +903,7 @@ update_contributors() {
 }
 
 # Default settings
+CCACHE_CACHE_SIZE="4G"
 ENABLE_RAMDISK="auto"
 
 # Load configuration file
@@ -1013,6 +1018,7 @@ buildtoolchain() {
 	lfsmake1 make
 	lfsmake1 patch
 	lfsmake1 perl
+	lfsmake1 python3
 	lfsmake1 sed
 	lfsmake1 tar
 	lfsmake1 texinfo
@@ -1335,8 +1341,12 @@ buildipfire() {
   lfsmake2 setserial
   lfsmake2 setup
   lfsmake2 libdnet
+  lfsmake2 jansson
   lfsmake2 yaml
   lfsmake2 libhtp
+  lfsmake2 colm
+  lfsmake2 ragel
+  lfsmake2 hyperscan
   lfsmake2 suricata
   lfsmake2 oinkmaster
   lfsmake2 ids-ruleset-sources
@@ -1484,7 +1494,6 @@ buildipfire() {
   lfsmake2 perl-gettext
   lfsmake2 perl-Sort-Naturally
   lfsmake2 vdradmin
-  lfsmake2 miau
   lfsmake2 perl-DBI
   lfsmake2 perl-DBD-SQLite
   lfsmake2 perl-File-ReadBackwards
@@ -1496,7 +1505,6 @@ buildipfire() {
   lfsmake2 watchdog
   lfsmake2 libpri
   lfsmake2 libsrtp
-  lfsmake2 jansson
   lfsmake2 asterisk
   lfsmake2 usb_modeswitch
   lfsmake2 usb_modeswitch_data
@@ -1613,6 +1621,7 @@ buildipfire() {
   lfsmake2 zabbix_agentd
   lfsmake2 flashrom
   lfsmake2 firmware-update
+  lfsmake2 tshark
 }
 
 buildinstaller() {