webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-27 19:23:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

make.sh: Rename HOST_MEM to SYSTEM_MEMORY

Browse Source 
We had two variables holding the same data

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
This commit is contained in:
Michael Tremer
2019-03-04 11:35:15 +00:00
parent 8556093359
commit deffc27598
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
make.sh
View File

@@ -205,7 +205,7 @@ 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 mem_max=$(( ${SYSTEM_MEMORY} / 192 ))
local processors="$(system_processors)"
local cpu_max=$(( ${processors} + 1 ))
@@ -237,7 +237,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
@@ -915,9 +915,6 @@ fi
SYSTEM_PROCESSORS="$(system_processors)"
SYSTEM_MEMORY="$(system_memory)"
# Get the amount of memory in this build system
HOST_MEM=$(system_memory)
if [ -n "${BUILD_ARCH}" ]; then
configure_build "${BUILD_ARCH}"
else