X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=make.sh;h=86359ce15268235ec8e6a9716a2ad0edbd420e99;hb=5c3f3da55921a8f027d06d69df8bde19fef0c478;hp=799aeee6603d3b7c57ccab8c97f7f87d186f854c;hpb=251556c9bea35c137bdbe5d93b1ed0959d639955;p=people%2Fpmueller%2Fipfire-2.x.git

diff --git a/make.sh b/make.sh
index 799aeee660..86359ce152 100755
--- a/make.sh
+++ b/make.sh
@@ -26,7 +26,7 @@ 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.25"							# Version number
-CORE="149"							# Core Level (Filename)
+CORE="154"							# Core Level (Filename)
 SLOGAN="www.ipfire.org"						# Software slogan
 CONFIG_ROOT=/var/ipfire						# Configuration rootdir
 NICE=10								# Nice level
@@ -39,7 +39,7 @@ GIT_BRANCH="$(git rev-parse --abbrev-ref HEAD)"			# Git Branch
 GIT_TAG="$(git tag | tail -1)"					# Git Tag
 GIT_LASTCOMMIT="$(git rev-parse --verify HEAD)"			# Last commit
 
-TOOLCHAINVER=20200324
+TOOLCHAINVER=20200924
 
 ###############################################################################
 #
@@ -146,21 +146,21 @@ configure_build() {
 			BUILDTARGET="${build_arch}-unknown-linux-gnu"
 			CROSSTARGET="${build_arch}-cross-linux-gnu"
 			BUILD_PLATFORM="x86"
-			CFLAGS_ARCH="-m64 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic"
+			CFLAGS_ARCH="-m64 -mtune=generic -fstack-clash-protection -fcf-protection"
 			;;
 
 		i586)
 			BUILDTARGET="${build_arch}-pc-linux-gnu"
 			CROSSTARGET="${build_arch}-cross-linux-gnu"
 			BUILD_PLATFORM="x86"
-			CFLAGS_ARCH="-march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer"
+			CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
 			;;
 
 		aarch64)
 			BUILDTARGET="${build_arch}-unknown-linux-gnu"
 			CROSSTARGET="${build_arch}-cross-linux-gnu"
 			BUILD_PLATFORM="arm"
-			CFLAGS_ARCH=""
+			CFLAGS_ARCH="-fstack-clash-protection"
 			;;
 
 		armv7hl)
@@ -220,6 +220,9 @@ configure_build() {
 	# Use this as default PARALLELISM
 	DEFAULT_PARALLELISM="${parallelism}"
 
+	# Limit lauched ninja build jobs to computed parallel value.
+	NINJAJOBS="${parallelism}"
+
 	# Compression parameters
 	# We use mode 8 for reasonable memory usage when decompressing
 	# but with overall good compression
@@ -465,7 +468,7 @@ prepareenv() {
 	# Setup environment
 	set +h
 	LC_ALL=POSIX
-	export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM RUSTFLAGS
+	export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM RUSTFLAGS NINJAJOBS
 	unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
 	# Make some extra directories
@@ -476,7 +479,7 @@ prepareenv() {
 
 	if [ "${ENABLE_RAMDISK}" = "on" ]; then
 		mkdir -p $BASEDIR/build/usr/src
-		mount -t tmpfs tmpfs -o size=4G,nr_inodes=1M,mode=1777 $BASEDIR/build/usr/src
+		mount -t tmpfs tmpfs -o size=8G,nr_inodes=1M,mode=1777 $BASEDIR/build/usr/src
 
 		mkdir -p ${BASEDIR}/build/tmp
 		mount -t tmpfs tmpfs -o size=4G,nr_inodes=1M,mode=1777 ${BASEDIR}/build/tmp
@@ -1093,7 +1096,6 @@ buildbase() {
 	lfsmake2 m4
 	lfsmake2 bison
 	lfsmake2 ncurses
-	lfsmake2 procps
 	lfsmake2 libtool
 	lfsmake2 perl
 	lfsmake2 readline
@@ -1102,6 +1104,9 @@ buildbase() {
 	lfsmake2 xz
 	lfsmake2 pcre
 	lfsmake2 pcre-compat
+	lfsmake2 gettext
+	lfsmake2 attr
+	lfsmake2 acl
 	lfsmake2 bash
 	lfsmake2 diffutils
 	lfsmake2 e2fsprogs
@@ -1109,7 +1114,6 @@ buildbase() {
 	lfsmake2 findutils
 	lfsmake2 flex
 	lfsmake2 gawk
-	lfsmake2 gettext
 	lfsmake2 go
 	lfsmake2 grep
 	lfsmake2 groff
@@ -1121,6 +1125,7 @@ buildbase() {
 	lfsmake2 kbd
 	lfsmake2 less
 	lfsmake2 pkg-config
+	lfsmake2 procps
 	lfsmake2 make
 	lfsmake2 man
 	lfsmake2 net-tools
@@ -1233,12 +1238,14 @@ buildipfire() {
   lfsmake2 linux-atm
   lfsmake2 gdbm
   lfsmake2 pam
+  lfsmake2 c-ares
   lfsmake2 curl
   lfsmake2 tcl
   lfsmake2 sqlite
   lfsmake2 libffi
   lfsmake2 python
   lfsmake2 python3
+  lfsmake2 gdb
   lfsmake2 grub
   lfsmake2 efivar
   lfsmake2 efibootmgr
@@ -1251,8 +1258,11 @@ buildipfire() {
   lfsmake2 nasm
   lfsmake2 libarchive
   lfsmake2 cmake
+  lfsmake2 ninja
+  lfsmake2 meson
   lfsmake2 libjpeg
   lfsmake2 libjpeg-compat
+  lfsmake2 openjpeg
   lfsmake2 libexif
   lfsmake2 libpng
   lfsmake2 libtiff
@@ -1261,8 +1271,6 @@ buildipfire() {
   lfsmake2 slang
   lfsmake2 newt
   lfsmake2 libsmooth
-  lfsmake2 attr
-  lfsmake2 acl
   lfsmake2 libcap
   lfsmake2 libcap-ng
   lfsmake2 pciutils
@@ -1295,11 +1303,13 @@ buildipfire() {
   lfsmake2 perl-Device-SerialPort
   lfsmake2 perl-Device-Modem
   lfsmake2 perl-Apache-Htpasswd
+  lfsmake2 perl-Parse-Yapp
   lfsmake2 gnupg
   lfsmake2 hdparm
   lfsmake2 sdparm
   lfsmake2 mtools
   lfsmake2 whatmask
+  lfsmake2 libtirpc
   lfsmake2 conntrack-tools
   lfsmake2 libupnp
   lfsmake2 ipaddr
@@ -1335,7 +1345,6 @@ buildipfire() {
   lfsmake2 Archive-Tar
   lfsmake2 Archive-Zip
   lfsmake2 Text-Tabs+Wrap
-  lfsmake2 Locale-Country
   lfsmake2 XML-Parser
   lfsmake2 Crypt-PasswdMD5
   lfsmake2 Net-Telnet
@@ -1382,6 +1391,7 @@ buildipfire() {
   lfsmake2 spandsp
   lfsmake2 lz4
   lfsmake2 lzo
+  lfsmake2 zstd
   lfsmake2 openvpn
   lfsmake2 mpage
   lfsmake2 dbus
@@ -1393,12 +1403,14 @@ buildipfire() {
   lfsmake2 ghostscript
   lfsmake2 qpdf
   lfsmake2 poppler
+  lfsmake2 poppler-data
   lfsmake2 cups-filters
   lfsmake2 epson-inkjet-printer-escpr
   lfsmake2 foomatic
   lfsmake2 hplip
   lfsmake2 cifs-utils
   lfsmake2 krb5
+  lfsmake2 rpcsvc-proto
   lfsmake2 samba
   lfsmake2 netatalk
   lfsmake2 sudo
@@ -1412,9 +1424,6 @@ buildipfire() {
   lfsmake2 fetchmail
   lfsmake2 clamav
   lfsmake2 perl-NetAddr-IP
-  lfsmake2 spamassassin
-  lfsmake2 perl-Net-LibIDN
-  lfsmake2 amavisd
   lfsmake2 dma
   lfsmake2 alsa
   lfsmake2 mpfire
@@ -1433,9 +1442,9 @@ buildipfire() {
   lfsmake2 libmpeg2
   lfsmake2 gnump3d
   lfsmake2 rsync
-  lfsmake2 libtirpc
   lfsmake2 rpcbind
   lfsmake2 keyutils
+  lfsmake2 libnfsidmap
   lfsmake2 nfs
   lfsmake2 gnu-netcat
   lfsmake2 ncat
@@ -1558,6 +1567,7 @@ buildipfire() {
   lfsmake2 python3-s3transfer
   lfsmake2 python3-rsa
   lfsmake2 python3-pyasn1
+  lfsmake2 python3-urllib3
   lfsmake2 python3-botocore
   lfsmake2 python3-llfuse
   lfsmake2 python3-msgpack
@@ -1617,6 +1627,7 @@ buildipfire() {
   lfsmake2 libpciaccess
   lfsmake2 libyajl
   lfsmake2 libvirt
+  lfsmake2 libtalloc
   lfsmake2 freeradius
   lfsmake2 perl-common-sense
   lfsmake2 perl-inotify2
@@ -1629,6 +1640,7 @@ buildipfire() {
   lfsmake2 dehydrated
   lfsmake2 shairport-sync
   lfsmake2 borgbackup
+  lfsmake2 lmdb
   lfsmake2 knot
   lfsmake2 spectre-meltdown-checker
   lfsmake2 zabbix_agentd
@@ -1639,6 +1651,9 @@ buildipfire() {
   lfsmake2 rfkill
   lfsmake2 amazon-ssm-agent
   lfsmake2 libloc
+  lfsmake2 ncdu
+  lfsmake2 lshw
+  lfsmake2 socat
 }
 
 buildinstaller() {