X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=e4c5a3a95909490a4eecbd03f254847981edb1ef;hb=2f422374878c6923983de526e0146dc184422417;hp=e70da788eb7e424ae3f6052f501a0af78b17dfe3;hpb=ffcef39d403c0dd1b1e658e4a18c63a2bc0501cc;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/make.sh b/make.sh
index e70da788eb..e4c5a3a959 100755
--- a/make.sh
+++ b/make.sh
@@ -26,8 +26,8 @@ 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="136"							# Core Level (Filename)
+PAKFIRE_CORE="136"						# 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
@@ -38,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=20190814
 
 ###############################################################################
 #
@@ -282,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,7 +469,13 @@ 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
+		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
@@ -481,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
@@ -513,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() {
@@ -727,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}"
@@ -892,6 +902,10 @@ update_contributors() {
 	return 0
 }
 
+# Default settings
+CCACHE_CACHE_SIZE="4G"
+ENABLE_RAMDISK="auto"
+
 # Load configuration file
 if [ -f .config ]; then
 	. .config
@@ -913,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
@@ -996,6 +1018,7 @@ buildtoolchain() {
 	lfsmake1 make
 	lfsmake1 patch
 	lfsmake1 perl
+	lfsmake1 python3
 	lfsmake1 sed
 	lfsmake1 tar
 	lfsmake1 texinfo
@@ -1268,6 +1291,8 @@ buildipfire() {
   lfsmake2 misc-progs
   lfsmake2 nano
   lfsmake2 URI
+  lfsmake2 perl-CGI
+  lfsmake2 perl-Switch
   lfsmake2 HTML-Tagset
   lfsmake2 HTML-Parser
   lfsmake2 HTML-Template
@@ -1318,8 +1343,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
@@ -1363,7 +1392,9 @@ buildipfire() {
   lfsmake2 fetchmail
   lfsmake2 cyrus-imapd
   lfsmake2 clamav
+  lfsmake2 perl-NetAddr-IP
   lfsmake2 spamassassin
+  lfsmake2 perl-Net-LibIDN
   lfsmake2 amavisd
   lfsmake2 dma
   lfsmake2 alsa
@@ -1467,7 +1498,6 @@ buildipfire() {
   lfsmake2 perl-gettext
   lfsmake2 perl-Sort-Naturally
   lfsmake2 vdradmin
-  lfsmake2 miau
   lfsmake2 perl-DBI
   lfsmake2 perl-DBD-SQLite
   lfsmake2 perl-File-ReadBackwards
@@ -1479,7 +1509,6 @@ buildipfire() {
   lfsmake2 watchdog
   lfsmake2 libpri
   lfsmake2 libsrtp
-  lfsmake2 jansson
   lfsmake2 asterisk
   lfsmake2 usb_modeswitch
   lfsmake2 usb_modeswitch_data
@@ -1493,6 +1522,7 @@ buildipfire() {
   lfsmake2 swig
   lfsmake2 u-boot
   lfsmake2 u-boot-kirkwood
+  lfsmake2 u-boot-friendlyarm
   lfsmake2 python-typing
   lfsmake2 python-m2crypto
   lfsmake2 wireless-regdb
@@ -1597,6 +1627,7 @@ buildipfire() {
   lfsmake2 flashrom
   lfsmake2 firmware-update
   lfsmake2 tshark
+  lfsmake2 geoip-generator
 }
 
 buildinstaller() {