X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=9893fbb20e5a0099510445c8a0094f65e5019e56;hp=f65cbb69d748711efb2ecc6a022d2ba335a792a4;hb=27267889aa791b5c4683f62fe823ab96fb42fe8a;hpb=5c82a9f0409e67dd10aeacf82fdcf3042fea31c7

diff --git a/make.sh b/make.sh
index f65cbb69d7..9893fbb20e 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.19"							# Version number
-CORE="118"							# Core Level (Filename)
-PAKFIRE_CORE="118"						# Core Level (PAKFIRE)
+CORE="121"							# Core Level (Filename)
+PAKFIRE_CORE="120"						# 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=20180210
+TOOLCHAINVER=20180213
 
 ###############################################################################
 #
@@ -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)
@@ -416,7 +416,7 @@ prepareenv() {
 
 	# Checking if running as root user
 	if [ $(id -u) -ne 0 ]; then
-			exiterror "Not building as root"
+			exiterror "root privileges required for building"
 	fi
 
 	# Checking for necessary temporary space
@@ -526,6 +526,7 @@ enterchroot() {
 		CCACHE_COMPRESS="${CCACHE_COMPRESS}" \
 		CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
 		KVER="${KVER}" \
+		XZ_OPT="${XZ_OPT}" \
 		$(fake_environ) \
 		$(qemu_environ) \
 		"$@"
@@ -860,6 +861,21 @@ fi
 # Get the amount of memory in this build system
 HOST_MEM=$(system_memory)
 
+# Checking host memory, tuning XZ_OPT
+
+if [ $HOST_MEM -lt 1024 ]; then
+	print_build_stage "Host-Memory: $HOST_MEM MiB"
+	print_build_stage "Not enough host memory (less than 1024 MiB, please consider upgrading)"
+
+	exit 1
+
+else
+
+	XZ_MEM="$(( HOST_MEM * 7 / 10 ))MiB"
+	XZ_OPT="-T4 -8 --memory=$XZ_MEM"
+
+fi
+
 if [ -n "${BUILD_ARCH}" ]; then
 	configure_build "${BUILD_ARCH}"
 else
@@ -928,6 +944,7 @@ buildtoolchain() {
 	lfsmake1 gcc			PASS=L
 	lfsmake1 binutils			PASS=2
 	lfsmake1 gcc			PASS=2
+	lfsmake1 zlib
 	lfsmake1 ccache			PASS=2
 	lfsmake1 tcl
 	lfsmake1 expect
@@ -1043,13 +1060,12 @@ buildipfire() {
   lfsmake2 unzip
   lfsmake2 which
   lfsmake2 linux-firmware
-  lfsmake2 ath10k-firmware
   lfsmake2 dvb-firmwares
-  lfsmake2 mt7601u-firmware
+  lfsmake2 xr819-firmware
   lfsmake2 zd1211-firmware
   lfsmake2 rpi-firmware
   lfsmake2 bc
-  lfsmake2 u-boot
+  lfsmake2 u-boot MKIMAGE=1
   lfsmake2 cpio
   lfsmake2 mdadm
   lfsmake2 dracut
@@ -1064,66 +1080,63 @@ buildipfire() {
   lfsmake2 libnetfilter_cthelper
   lfsmake2 libnetfilter_cttimeout
   lfsmake2 iptables
+  lfsmake2 screen
+  lfsmake2 elfutils
 
   case "${BUILD_ARCH}" in
 	x86_64)
 		lfsmake2 linux			KCFG=""
-		lfsmake2 backports			KCFG=""
-		lfsmake2 e1000e			KCFG=""
-		lfsmake2 igb				KCFG=""
-		lfsmake2 ixgbe			KCFG=""
+#		lfsmake2 backports			KCFG=""
+#		lfsmake2 e1000e			KCFG=""
+#		lfsmake2 igb				KCFG=""
+#		lfsmake2 ixgbe			KCFG=""
 		lfsmake2 xtables-addons		KCFG=""
 		lfsmake2 linux-initrd			KCFG=""
 		;;
 	i586)
 		# x86-pae (Native and new XEN) kernel build
 		lfsmake2 linux			KCFG="-pae"
-		lfsmake2 backports			KCFG="-pae"
-		lfsmake2 e1000e			KCFG="-pae"
-		lfsmake2 igb				KCFG="-pae"
-		lfsmake2 ixgbe			KCFG="-pae"
+#		lfsmake2 backports			KCFG="-pae"
+#		lfsmake2 e1000e			KCFG="-pae"
+#		lfsmake2 igb				KCFG="-pae"
+#		lfsmake2 ixgbe			KCFG="-pae"
 		lfsmake2 xtables-addons		KCFG="-pae"
 		lfsmake2 linux-initrd			KCFG="-pae"
 
 		# x86 kernel build
 		lfsmake2 linux			KCFG=""
-		lfsmake2 backports			KCFG=""
-		lfsmake2 e1000e			KCFG=""
-		lfsmake2 igb				KCFG=""
-		lfsmake2 ixgbe			KCFG=""
+#		lfsmake2 backports			KCFG=""
+#		lfsmake2 e1000e			KCFG=""
+#		lfsmake2 igb				KCFG=""
+#		lfsmake2 ixgbe			KCFG=""
 		lfsmake2 xtables-addons		KCFG=""
 		lfsmake2 linux-initrd			KCFG=""
 		;;
 
 	armv5tel)
-		# arm-rpi (Raspberry Pi) kernel build
-		lfsmake2 linux			KCFG="-rpi"
-		lfsmake2 backports			KCFG="-rpi"
-		lfsmake2 xtables-addons		KCFG="-rpi"
-		lfsmake2 linux-initrd			KCFG="-rpi"
+		# arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
+		lfsmake2 linux			KCFG="-kirkwood"
+#		lfsmake2 backports			KCFG="-kirkwood"
+#		lfsmake2 e1000e			KCFG="-kirkwood"
+#		lfsmake2 igb				KCFG="-kirkwood"
+#		lfsmake2 ixgbe			KCFG="-kirkwood"
+		lfsmake2 xtables-addons		KCFG="-kirkwood"
+		lfsmake2 linux-initrd			KCFG="-kirkwood"
 
 		# arm multi platform (Panda, Wandboard ...) kernel build
 		lfsmake2 linux			KCFG="-multi"
-		lfsmake2 backports			KCFG="-multi"
-		lfsmake2 e1000e			KCFG="-multi"
-		lfsmake2 igb				KCFG="-multi"
-		lfsmake2 ixgbe			KCFG="-multi"
+#		lfsmake2 backports			KCFG="-multi"
+#		lfsmake2 e1000e			KCFG="-multi"
+#		lfsmake2 igb				KCFG="-multi"
+#		lfsmake2 ixgbe			KCFG="-multi"
 		lfsmake2 xtables-addons		KCFG="-multi"
 		lfsmake2 linux-initrd			KCFG="-multi"
-
-		# arm-kirkwood (Dreamplug, ICY-Box ...) kernel build
-		lfsmake2 linux			KCFG="-kirkwood"
-		lfsmake2 backports			KCFG="-kirkwood"
-		lfsmake2 e1000e			KCFG="-kirkwood"
-		lfsmake2 igb				KCFG="-kirkwood"
-		lfsmake2 ixgbe			KCFG="-kirkwood"
-		lfsmake2 xtables-addons		KCFG="-kirkwood"
-		lfsmake2 linux-initrd			KCFG="-kirkwood"
 		;;
   esac
   lfsmake2 xtables-addons			USPACE="1"
   lfsmake2 openssl
   [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
+  lfsmake2 openssl-compat
   lfsmake2 libgpg-error
   lfsmake2 libgcrypt
   lfsmake2 libassuan
@@ -1174,7 +1187,6 @@ buildipfire() {
   lfsmake2 libxml2
   lfsmake2 libxslt
   lfsmake2 BerkeleyDB
-  lfsmake2 mysql
   lfsmake2 cyrus-sasl
   lfsmake2 openldap
   lfsmake2 apache2
@@ -1210,8 +1222,6 @@ buildipfire() {
   lfsmake2 ipaddr
   lfsmake2 iputils
   lfsmake2 l7-protocols
-  lfsmake2 mISDNuser
-  lfsmake2 capi4k-utils
   lfsmake2 hwdata
   lfsmake2 logrotate
   lfsmake2 logwatch
@@ -1255,7 +1265,6 @@ buildipfire() {
   lfsmake2 python-ipaddress
   lfsmake2 glib
   lfsmake2 GeoIP
-  lfsmake2 noip_updater
   lfsmake2 ntp
   lfsmake2 openssh
   lfsmake2 fontconfig
@@ -1284,7 +1293,6 @@ buildipfire() {
   lfsmake2 lz4
   lfsmake2 lzo
   lfsmake2 openvpn
-  lfsmake2 pammysql
   lfsmake2 mpage
   lfsmake2 dbus
   lfsmake2 intltool
@@ -1305,7 +1313,7 @@ buildipfire() {
   lfsmake2 mc
   lfsmake2 wget
   lfsmake2 bridge-utils
-  lfsmake2 screen
+#  lfsmake2 screen
   lfsmake2 smartmontools
   lfsmake2 htop
   lfsmake2 chkconfig
@@ -1334,7 +1342,6 @@ buildipfire() {
   lfsmake2 cmake
   lfsmake2 gnump3d
   lfsmake2 rsync
-  lfsmake2 tcpwrapper
   lfsmake2 libtirpc
   lfsmake2 rpcbind
   lfsmake2 nfs
@@ -1416,7 +1423,6 @@ buildipfire() {
   lfsmake2 vdradmin
   lfsmake2 miau
   lfsmake2 perl-DBI
-  lfsmake2 perl-DBD-mysql
   lfsmake2 perl-DBD-SQLite
   lfsmake2 perl-File-ReadBackwards
   lfsmake2 openvmtools
@@ -1439,6 +1445,8 @@ buildipfire() {
   lfsmake2 powertop
   lfsmake2 parted
   lfsmake2 swig
+  lfsmake2 u-boot
+  lfsmake2 u-boot-kirkwood
   lfsmake2 python-typing
   lfsmake2 python-m2crypto
   lfsmake2 wireless-regdb
@@ -1469,7 +1477,6 @@ buildipfire() {
   lfsmake2 sendEmail
   lfsmake2 sysbench
   lfsmake2 strace
-  lfsmake2 elfutils
   lfsmake2 ltrace
   lfsmake2 ipfire-netboot
   lfsmake2 lcdproc
@@ -1498,7 +1505,6 @@ buildipfire() {
   lfsmake2 pigz
   lfsmake2 tmux
   lfsmake2 perl-Text-CSV_XS
-  lfsmake2 swconfig
   lfsmake2 haproxy
   lfsmake2 ipset
   lfsmake2 lua
@@ -1518,6 +1524,7 @@ buildipfire() {
   lfsmake2 wio
   lfsmake2 iftop
   lfsmake2 mdns-repeater
+  lfsmake2 i2c-tools
 }
 
 buildinstaller() {
@@ -1564,7 +1571,6 @@ buildpackages() {
   modprobe loop 2>/dev/null
   if [ $BUILD_IMAGES == 1 ] && ([ -e /dev/loop/0 ] || [ -e /dev/loop0 ] || [ -e "/dev/loop-control" ]); then
 	lfsmake2 flash-images
-	lfsmake2 flash-images SCON=1
   fi
 
   mv $LFS/install/images/{*.iso,*.tgz,*.img.gz,*.bz2} $BASEDIR >> $LOGFILE 2>&1
@@ -1770,7 +1776,7 @@ toolchain)
 	buildtoolchain
 	echo "`date -u '+%b %e %T'`: Create toolchain image for ${BUILD_ARCH}" | tee -a $LOGFILE
 	test -d $BASEDIR/cache/toolchains || mkdir -p $BASEDIR/cache/toolchains
-	cd $BASEDIR && XZ_OPT="-T0 -8" tar -Jc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \
+	cd $BASEDIR && XZ_OPT="$(XZ_OPT)" tar -Jc --exclude='log/_build.*.log' -f cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz --xz \
 		build/${TOOLS_DIR} build/bin/sh log >> $LOGFILE
 	md5sum cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.tar.xz \
 		> cache/toolchains/$SNAME-$VERSION-toolchain-$TOOLCHAINVER-${BUILD_ARCH}.md5