]> git.ipfire.org Git - ipfire-2.x.git/blobdiff - make.sh
joe: Bump package because of ncurses update
[ipfire-2.x.git] / make.sh
diff --git a/make.sh b/make.sh
index 5d71bab789b990a5f6721009af65fbe7613317ca..d7f56f293a64fe9de10fdcd9550bc7c2cc659841 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -862,16 +862,14 @@ fi
 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"
+if [ ${HOST_MEM} -lt 1024 ]; then
+       exiterror "You will need more than 1GB or host memory to run the build"
 fi
 
+# We compress archives with "xz -8", using all cores and up to 70% of memory
+XZ_MEM="$(( HOST_MEM * 7 / 10 ))MiB"
+XZ_OPT="-T$(system_processors) -8 --memory=${XZ_MEM}"
+
 if [ -n "${BUILD_ARCH}" ]; then
        configure_build "${BUILD_ARCH}"
 else