X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=30b42bbdbc7bca27e5894707dfb44f1d0e6604c7;hp=bfcc83709fb1d4917562b34eee33d3fe72a1d02b;hb=4e54a8e2d6d4286f85a38a492d34452092404b24;hpb=20c7552e0d1453e90cd069a83c712ff29fb1cbc7

diff --git a/make.sh b/make.sh
index bfcc83709f..30b42bbdbc 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="133"							# Core Level (Filename)
+PAKFIRE_CORE="132"						# 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
 
 ###############################################################################
 #
@@ -281,6 +282,7 @@ stdumount() {
 	umount $BASEDIR/build/usr/src/lfs		2>/dev/null;
 	umount $BASEDIR/build/usr/src/log		2>/dev/null;
 	umount $BASEDIR/build/usr/src/src		2>/dev/null;
+	umount $BASEDIR/build/usr/src		2>/dev/null;
 }
 
 now() {
@@ -468,6 +470,12 @@ prepareenv() {
 	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
+
+	if [ "${ENABLE_RAMDISK}" = "on" ]; then
+		mkdir -p $BASEDIR/build/usr/src
+		mount -t tmpfs tmpfs -o size=4G,mode=1777 $BASEDIR/build/usr/src
+	fi
+
 	mkdir -p $BASEDIR/build/usr/src/{cache,config,doc,html,langs,lfs,log,src,ccache}
 
 	mknod -m 600 $BASEDIR/build/dev/console c 5 1 2>/dev/null
@@ -512,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() {
@@ -726,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}"
@@ -891,6 +902,10 @@ update_contributors() {
 	return 0
 }
 
+# Default settings
+CCACHE_CACHE_SIZE="8G"
+ENABLE_RAMDISK="auto"
+
 # Load configuration file
 if [ -f .config ]; then
 	. .config
@@ -912,6 +927,14 @@ else
 	configure_build "default"
 fi
 
+# Automatically enable/disable ramdisk usage
+if [ "${ENABLE_RAMDISK}" = "auto" ]; then
+	# Enable only when the host system has 4GB of RAM or more
+	if [ ${SYSTEM_MEMORY} -ge 3900 ]; then
+		ENABLE_RAMDISK="on"
+	fi
+fi
+
 buildtoolchain() {
 	local error=false
 	case "${BUILD_ARCH}:${HOST_ARCH}" in
@@ -995,6 +1018,7 @@ buildtoolchain() {
 	lfsmake1 make
 	lfsmake1 patch
 	lfsmake1 perl
+	lfsmake1 python3
 	lfsmake1 sed
 	lfsmake1 tar
 	lfsmake1 texinfo
@@ -1317,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
@@ -1478,7 +1506,6 @@ buildipfire() {
   lfsmake2 watchdog
   lfsmake2 libpri
   lfsmake2 libsrtp
-  lfsmake2 jansson
   lfsmake2 asterisk
   lfsmake2 usb_modeswitch
   lfsmake2 usb_modeswitch_data
@@ -1595,6 +1622,7 @@ buildipfire() {
   lfsmake2 zabbix_agentd
   lfsmake2 flashrom
   lfsmake2 firmware-update
+  lfsmake2 tshark
 }
 
 buildinstaller() {