X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=d015dd95a0e5a51ca70172570bd5cc1a83d1a403;hp=1b5cac46f2c9cc6fae81af4c10beff5d7b20a1b9;hb=854b63c42af8f82106b587dc43945ad848f8994e;hpb=71a355c3a246a5de886ffee0376d83be942f48df

diff --git a/make.sh b/make.sh
index 1b5cac46f2..d015dd95a0 100755
--- a/make.sh
+++ b/make.sh
@@ -24,9 +24,9 @@
 
 NAME="IPFire"							# Software name
 SNAME="ipfire"							# Short name
-VERSION="2.21"							# Version number
-CORE="129"							# Core Level (Filename)
-PAKFIRE_CORE="128"						# Core Level (PAKFIRE)
+VERSION="2.23"							# Version number
+CORE="131"							# Core Level (Filename)
+PAKFIRE_CORE="130"						# 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
@@ -201,31 +201,22 @@ configure_build() {
 	CXXFLAGS="${CFLAGS}"
 
 	# Determine parallelism
-	if [ -z "${MAKETUNING}" ]; then
-		# 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 parallelism
-		if [ ${mem_max} -lt ${cpu_max} ]; then
-			parallelism=${mem_max}
-		else
-			parallelism=${cpu_max}
-		fi
-
-		# limit to -j23 because perl will not build
-		# more
-		if [ ${parallelism} -gt 23 ]; then
-			parallelism=23
-		fi
-
-		MAKETUNING="-j${parallelism}"
+	# We assume that each process consumes about
+	# 128MB of memory. Therefore we find out how
+	# many processes fit into memory.
+	local mem_max=$(( ${SYSTEM_MEMORY} / 128 ))
+	local cpu_max=$(( ${SYSTEM_PROCESSORS} + 1 ))
+
+	local parallelism
+	if [ ${mem_max} -lt ${cpu_max} ]; then
+		parallelism=${mem_max}
+	else
+		parallelism=${cpu_max}
 	fi
 
+	# Use this as default PARALLELISM
+	DEFAULT_PARALLELISM="${parallelism}"
+
 	# Compression parameters
 	# We use mode 8 for reasonable memory usage when decompressing
 	# but with overall good compression
@@ -237,7 +228,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 +460,7 @@ prepareenv() {
 	# Setup environment
 	set +h
 	LC_ALL=POSIX
-	export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
+	export LFS LC_ALL CFLAGS CXXFLAGS DEFAULT_PARALLELISM
 	unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD
 
 	# Make some extra directories
@@ -554,6 +545,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) \
 		"$@"
@@ -633,7 +627,9 @@ lfsmake1() {
 		CCACHE_COMPILERCHECK="${CCACHE_COMPILERCHECK}" \
 		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}" \
@@ -662,7 +658,6 @@ lfsmake2() {
 
 	enterchroot \
 		${EXTRA_PATH}bash -x -c "cd /usr/src/lfs && \
-			MAKETUNING=${MAKETUNING} \
 			make -f $* \
 			LFS_BASEDIR=/usr/src install" \
 		>> ${LOGFILE} 2>&1 &
@@ -907,8 +902,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}"
@@ -1088,6 +1084,7 @@ buildipfire() {
   lfsmake2 openssl
   [ "${BUILD_ARCH}" = "i586" ] && lfsmake2 openssl KCFG='-sse2'
   lfsmake2 popt
+  lfsmake2 libedit
   lfsmake2 libusb
   lfsmake2 libusb-compat
   lfsmake2 libpcap
@@ -1101,6 +1098,7 @@ buildipfire() {
   lfsmake2 zd1211-firmware
   lfsmake2 rpi-firmware
   lfsmake2 intel-microcode
+  lfsmake2 pcengines-apu-firmware
   lfsmake2 bc
   lfsmake2 u-boot MKIMAGE=1
   lfsmake2 cpio
@@ -1220,6 +1218,7 @@ buildipfire() {
   lfsmake2 attr
   lfsmake2 acl
   lfsmake2 libcap
+  lfsmake2 libcap-ng
   lfsmake2 pciutils
   lfsmake2 usbutils
   lfsmake2 libxml2
@@ -1318,9 +1317,11 @@ buildipfire() {
   lfsmake2 setserial
   lfsmake2 setup
   lfsmake2 libdnet
-  lfsmake2 daq
-  lfsmake2 snort
+  lfsmake2 yaml
+  lfsmake2 libhtp
+  lfsmake2 suricata
   lfsmake2 oinkmaster
+  lfsmake2 ids-ruleset-sources
   lfsmake2 squid
   lfsmake2 squidguard
   lfsmake2 calamaris
@@ -1588,9 +1589,11 @@ buildipfire() {
   lfsmake2 dehydrated
   lfsmake2 shairport-sync
   lfsmake2 borgbackup
-  lfsmake2 libedit
   lfsmake2 knot
   lfsmake2 spectre-meltdown-checker
+  lfsmake2 zabbix_agentd
+  lfsmake2 flashrom
+  lfsmake2 firmware-update
 }
 
 buildinstaller() {