X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=92f1ffa601e4c9e827a78e4021f2ffc44383c2ea;hp=507cde6d8b5d43de5abcb6b63191fb9317a25c43;hb=77c863a2f113404a7f30b8591b9972291328980b;hpb=662b2a812f6bfd8e5143564c8b162abc2df0dbd6

diff --git a/make.sh b/make.sh
index 507cde6d8b..92f1ffa601 100755
--- a/make.sh
+++ b/make.sh
@@ -25,8 +25,8 @@
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
 VERSION="2.21"							# Version number
-CORE="128"							# Core Level (Filename)
-PAKFIRE_CORE="127"						# Core Level (PAKFIRE)
+CORE="129"							# Core Level (Filename)
+PAKFIRE_CORE="128"						# 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
@@ -205,10 +205,8 @@ configure_build() {
 		# We assume that each process consumes about
 		# 192MB of memory. Therefore we find out how
 		# many processes fit into memory.
-		local mem_max=$(( ${HOST_MEM} / 192 ))
-
-		local processors="$(system_processors)"
-		local cpu_max=$(( ${processors} + 1 ))
+		local mem_max=$(( ${SYSTEM_MEMORY} / 192 ))
+		local cpu_max=$(( ${SYSTEM_PROCESSORS} + 1 ))
 
 		local parallelism
 		if [ ${mem_max} -lt ${cpu_max} ]; then
@@ -217,6 +215,9 @@ configure_build() {
 			parallelism=${cpu_max}
 		fi
 
+		# Use this as default PARALLELISM
+		DEFAULT_PARALLELISM="${parallelism}"
+
 		# limit to -j23 because perl will not build
 		# more
 		if [ ${parallelism} -gt 23 ]; then
@@ -237,7 +238,7 @@ configure_build() {
 	# We need to limit memory because XZ uses too much when running
 	# in parallel and it isn't very smart in limiting itself.
 	# We allow XZ to use up to 70% of all system memory.
-	local xz_memory=$(( HOST_MEM * 7 / 10 ))
+	local xz_memory=$(( SYSTEM_MEMORY * 7 / 10 ))
 
 	# XZ memory cannot be larger than 2GB on 32 bit systems
 	case "${build_arch}" in
@@ -469,7 +470,7 @@ prepareenv() {
 	# Setup environment
 	set +h
 	LC_ALL=POSIX
-	export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
+	export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM MAKETUNING
 	unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
 	# Make some extra directories
@@ -554,6 +555,9 @@ enterchroot() {
 		CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
 		KVER="${KVER}" \
 		XZ_OPT="${XZ_OPT}" \
+		DEFAULT_PARALLELISM="${DEFAULT_PARALLELISM}" \
+		SYSTEM_PROCESSORS="${SYSTEM_PROCESSORS}" \
+		SYSTEM_MEMORY="${SYSTEM_MEMORY}" \
 		$(fake_environ) \
 		$(qemu_environ) \
 		"$@"
@@ -634,6 +638,9 @@ lfsmake1() {
 		CFLAGS="${CFLAGS}" \
 		CXXFLAGS="${CXXFLAGS}" \
 		MAKETUNING="${MAKETUNING}" \
+		DEFAULT_PARALLELISM="${DEFAULT_PARALLELISM}" \
+		SYSTEM_PROCESSORS="${SYSTEM_PROCESSORS}" \
+		SYSTEM_MEMORY="${SYSTEM_MEMORY}" \
 		make -f $* \
 			TOOLCHAIN=1 \
 			TOOLS_DIR="${TOOLS_DIR}" \
@@ -907,8 +914,9 @@ if [ -n "${TARGET_ARCH}" ]; then
 	unset TARGET_ARCH
 fi
 
-# Get the amount of memory in this build system
-HOST_MEM=$(system_memory)
+# Get some information about the host system
+SYSTEM_PROCESSORS="$(system_processors)"
+SYSTEM_MEMORY="$(system_memory)"
 
 if [ -n "${BUILD_ARCH}" ]; then
 	configure_build "${BUILD_ARCH}"
@@ -1100,6 +1108,7 @@ buildipfire() {
   lfsmake2 xr819-firmware
   lfsmake2 zd1211-firmware
   lfsmake2 rpi-firmware
+  lfsmake2 intel-microcode
   lfsmake2 bc
   lfsmake2 u-boot MKIMAGE=1
   lfsmake2 cpio
@@ -1172,7 +1181,6 @@ buildipfire() {
 		lfsmake2 linux-initrd			KCFG="-multi"
 		;;
   esac
-  lfsmake2 intel-microcode
   lfsmake2 xtables-addons			USPACE="1"
   lfsmake2 libgpg-error
   lfsmake2 libgcrypt
@@ -1512,6 +1520,8 @@ buildipfire() {
   lfsmake2 python3-rsa
   lfsmake2 python3-pyasn1
   lfsmake2 python3-botocore
+  lfsmake2 python3-llfuse
+  lfsmake2 python3-msgpack
   lfsmake2 aws-cli
   lfsmake2 transmission
   lfsmake2 dpfhack
@@ -1585,6 +1595,10 @@ buildipfire() {
   lfsmake2 nss-myhostname
   lfsmake2 dehydrated
   lfsmake2 shairport-sync
+  lfsmake2 borgbackup
+  lfsmake2 libedit
+  lfsmake2 knot
+  lfsmake2 spectre-meltdown-checker
 }
 
 buildinstaller() {