X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=blobdiff_plain;f=make.sh;h=f4d474d364c2c19a8f5fe87ded8561f01251bd6a;hp=f4a651af9ffefed3f84b86116df224fbdc206539;hb=a98ab1d7fdba5d18d42faab43bf03662ca4d4261;hpb=cf361ef4b55134254150b5070069f9d25b201bd1

diff --git a/make.sh b/make.sh
index f4a651af9f..f4d474d364 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="115"							# Core Level (Filename)
-PAKFIRE_CORE="115"						# Core Level (PAKFIRE)
+CORE="116"							# Core Level (Filename)
+PAKFIRE_CORE="116"						# 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
@@ -62,13 +62,17 @@ export BASEDIR LOGFILE
 DIR_CHK=$BASEDIR/cache/check
 mkdir $BASEDIR/log/ 2>/dev/null
 
-# Include funtions
-. tools/make-functions
-
+# Load configuration file
 if [ -f .config ]; then
 	. .config
 fi
 
+# Include funtions
+. tools/make-functions
+
+# Get the amount of memory in this build system
+HOST_MEM=$(system_memory)
+
 if [ -n "${BUILD_ARCH}" ]; then
 	configure_build "${BUILD_ARCH}"
 elif [ -n "${TARGET_ARCH}" ]; then
@@ -78,18 +82,6 @@ else
 	configure_build "default"
 fi
 
-if [ -z $EDITOR ]; then
-	for i in nano emacs vi; do
-		EDITOR=$(which $i 2>/dev/null)
-		if ! [ -z $EDITOR ]; then
-			export EDITOR=$EDITOR
-			break
-		fi
-	done
-	[ -z $EDITOR ] && exiterror "You should have installed an editor."
-fi
-
-
 prepareenv() {
     ############################################################################
     #                                                                          #
@@ -185,14 +177,6 @@ prepareenv() {
     # Setup environment
     set +h
     LC_ALL=POSIX
-    if [ -z $MAKETUNING ]; then
-	CPU_COUNT="$(getconf _NPROCESSORS_ONLN 2>/dev/null)"
-	if [ -z "${CPU_COUNT}" ]; then
-		CPU_COUNT=1
-	fi
-
-	MAKETUNING="-j$(( ${CPU_COUNT} * 2 + 1 ))"
-    fi
     export LFS LC_ALL CFLAGS CXXFLAGS MAKETUNING
     unset CC CXX CPP LD_LIBRARY_PATH LD_PRELOAD