X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=4e690b7f99fa5089299b20f92582ea43571d57e5;hp=bb80f3c052420f0f4cb106adf373b1f61d139601;hb=4720fa0d1ea9be7344c9c7491b3abdd515cecfb5;hpb=7b93b62bc8d82ee08a395ecaf7c4bac468f52f51

diff --git a/make.sh b/make.sh
index bb80f3c052..4e690b7f99 100755
--- a/make.sh
+++ b/make.sh
@@ -17,7 +17,7 @@
 # along with IPFire; if not, write to the Free Software                    #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA #
 #                                                                          #
-# Copyright (C) 2007-2017 IPFire Team <info@ipfire.org>.                   #
+# Copyright (C) 2007-2018 IPFire Team <info@ipfire.org>.                   #
 #                                                                          #
 ############################################################################
 #
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.19"							# Version number
-CORE="117"							# Core Level (Filename)
-PAKFIRE_CORE="116"						# Core Level (PAKFIRE)
+CORE="118"							# Core Level (Filename)
+PAKFIRE_CORE="118"						# 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 +37,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=20171121
+TOOLCHAINVER=20180126
 
 ###############################################################################
 #
@@ -144,14 +144,14 @@ configure_build() {
 			BUILDTARGET="${build_arch}-unknown-linux-gnu"
 			CROSSTARGET="${build_arch}-cross-linux-gnu"
 			BUILD_PLATFORM="x86"
-			CFLAGS_ARCH="-m64 -mtune=generic"
+			CFLAGS_ARCH="-m64 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic"
 			;;
 
 		i586)
 			BUILDTARGET="${build_arch}-pc-linux-gnu"
 			CROSSTARGET="${build_arch}-cross-linux-gnu"
 			BUILD_PLATFORM="x86"
-			CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer"
+			CFLAGS_ARCH="-march=i586 -mindirect-branch=thunk -mfunction-return=thunk -mtune=generic -fomit-frame-pointer"
 			;;
 
 		aarch64)
@@ -208,7 +208,7 @@ configure_build() {
 		local mem_max=$(( ${HOST_MEM} / 192 ))
 
 		local processors="$(system_processors)"
-		local cpu_max=$(( ${processors} * 2 ))
+		local cpu_max=$(( ${processors} + 1 ))
 
 		local parallelism
 		if [ ${mem_max} -lt ${cpu_max} ]; then
@@ -217,6 +217,12 @@ configure_build() {
 			parallelism=${cpu_max}
 		fi
 
+		# limit to -j23 because perl will not build
+		# more
+		if [ ${parallelism} -gt 23 ]; then
+			parallelism=23
+		fi
+
 		MAKETUNING="-j${parallelism}"
 	fi
 }
@@ -531,7 +537,7 @@ entershell() {
 	fi
 
 	echo "Entering to a shell inside LFS chroot, go out with exit"
-	local PS1="ipfire build chroot ($(uname -m)) \u:\w\$ "
+	local PS1="ipfire build chroot (${BUILD_ARCH}) \u:\w\$ "
 
 	if enterchroot bash -i; then
 		stdumount
@@ -627,7 +633,7 @@ lfsmake2() {
 	local PS1='\u:\w$ '
 
 	enterchroot \
-		bash -x -c "cd /usr/src/lfs && \
+		${EXTRA_PATH}bash -x -c "cd /usr/src/lfs && \
 			MAKETUNING=${MAKETUNING} \
 			make -f $* \
 			LFS_BASEDIR=/usr/src install" \
@@ -946,6 +952,8 @@ buildtoolchain() {
 	lfsmake1 tar
 	lfsmake1 texinfo
 	lfsmake1 xz
+	lfsmake1 bison
+	lfsmake1 flex
 	lfsmake1 fake-environ
 	lfsmake1 strip
 	lfsmake1 cleanup-toolchain
@@ -976,7 +984,6 @@ buildbase() {
 	lfsmake2 iana-etc
 	lfsmake2 m4
 	lfsmake2 bison
-	lfsmake2 ncurses-compat
 	lfsmake2 ncurses
 	lfsmake2 procps
 	lfsmake2 libtool
@@ -1003,6 +1010,7 @@ buildbase() {
 	lfsmake2 jwhois
 	lfsmake2 kbd
 	lfsmake2 less
+	lfsmake2 pkg-config
 	lfsmake2 make
 	lfsmake2 man
 	lfsmake2 kmod
@@ -1027,7 +1035,6 @@ buildipfire() {
   lfsmake2 configroot
   lfsmake2 initscripts
   lfsmake2 backup
-  lfsmake2 pkg-config
   lfsmake2 libusb
   lfsmake2 libusb-compat
   lfsmake2 libpcap
@@ -1123,7 +1130,6 @@ buildipfire() {
   lfsmake2 nettle
   lfsmake2 libevent
   lfsmake2 libevent2
-  lfsmake2 libevent2-compat
   lfsmake2 expat
   lfsmake2 apr
   lfsmake2 aprutil
@@ -1172,7 +1178,6 @@ buildipfire() {
   lfsmake2 cyrus-sasl
   lfsmake2 openldap
   lfsmake2 apache2
-  lfsmake2 php
   lfsmake2 web-user-interface
   lfsmake2 flag-icons
   lfsmake2 jquery
@@ -1276,6 +1281,7 @@ buildipfire() {
   lfsmake2 wireless
   lfsmake2 pakfire
   lfsmake2 spandsp
+  lfsmake2 lz4
   lfsmake2 lzo
   lfsmake2 openvpn
   lfsmake2 pammysql
@@ -1306,7 +1312,6 @@ buildipfire() {
   lfsmake2 postfix
   lfsmake2 fetchmail
   lfsmake2 cyrus-imapd
-  lfsmake2 openmailadmin
   lfsmake2 clamav
   lfsmake2 spamassassin
   lfsmake2 amavisd
@@ -1360,11 +1365,9 @@ buildipfire() {
   lfsmake2 qemu
   lfsmake2 sane
   lfsmake2 netpbm
-  lfsmake2 phpSANE
-  lfsmake2 tunctl
   lfsmake2 netsnmpd
-  lfsmake2 nagios
   lfsmake2 nagios_nrpe
+  lfsmake2 nagios-plugins
   lfsmake2 icinga
   lfsmake2 ebtables
   lfsmake2 directfb
@@ -1407,7 +1410,6 @@ buildipfire() {
   lfsmake2 streamripper
   lfsmake2 sshfs
   lfsmake2 taglib
-  #lfsmake2 mediatomb
   lfsmake2 sslh
   lfsmake2 perl-gettext
   lfsmake2 perl-Sort-Naturally
@@ -1417,9 +1419,7 @@ buildipfire() {
   lfsmake2 perl-DBD-mysql
   lfsmake2 perl-DBD-SQLite
   lfsmake2 perl-File-ReadBackwards
-  lfsmake2 cacti
   lfsmake2 openvmtools
-  lfsmake2 nagiosql
   lfsmake2 motion
   lfsmake2 joe
   lfsmake2 monit
@@ -1427,8 +1427,8 @@ buildipfire() {
   lfsmake2 watchdog
   lfsmake2 libpri
   lfsmake2 libsrtp
+  lfsmake2 jansson
   lfsmake2 asterisk
-  lfsmake2 lcr
   lfsmake2 usb_modeswitch
   lfsmake2 usb_modeswitch_data
   lfsmake2 zerofree
@@ -1488,7 +1488,6 @@ buildipfire() {
   lfsmake2 iptraf-ng
   lfsmake2 iotop
   lfsmake2 stunnel
-  lfsmake2 owncloud
   lfsmake2 bacula
   lfsmake2 batctl
   lfsmake2 perl-Font-TTF
@@ -1511,13 +1510,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
+  lfsmake2 mdns-repeater
 }
 
 buildinstaller() {
@@ -1526,7 +1525,8 @@ buildinstaller() {
   export LOGFILE
   lfsmake2 memtest
   lfsmake2 installer
-  lfsmake1 strip
+  # use toolchain bash for chroot to strip
+  EXTRA_PATH=${TOOLS_DIR}/bin/ lfsmake2 strip
 }
 
 buildpackages() {