X-Git-Url: http://git.ipfire.org/?p=people%2Fpmueller%2Fipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=bb4269d5d5fe56837adf1cc18356cffb507b4667;hp=f3b125dfba6b2cb579c1b68572125e48bcfedb7d;hb=03f68cbca90d9c1bc0b55c2f5aa4698a5d9d3eab;hpb=e4ee36fa170d08bccbbd32fe0d56e53f072a2f97

diff --git a/make.sh b/make.sh
index f3b125dfba..bb4269d5d5 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="130"							# Core Level (Filename)
+PAKFIRE_CORE="129"						# 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,29 +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=$(( ${SYSTEM_MEMORY} / 192 ))
-		local cpu_max=$(( ${SYSTEM_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
@@ -467,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
@@ -552,6 +545,7 @@ 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) \
@@ -633,7 +627,7 @@ 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 $* \
@@ -664,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 &
@@ -1223,6 +1216,7 @@ buildipfire() {
   lfsmake2 attr
   lfsmake2 acl
   lfsmake2 libcap
+  lfsmake2 libcap-ng
   lfsmake2 pciutils
   lfsmake2 usbutils
   lfsmake2 libxml2
@@ -1321,9 +1315,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
@@ -1594,6 +1590,7 @@ buildipfire() {
   lfsmake2 libedit
   lfsmake2 knot
   lfsmake2 spectre-meltdown-checker
+  lfsmake2 zabbix_agentd
 }
 
 buildinstaller() {