rpms/redhat-rpm-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Add better error checking to %constrain_build

Browse Source
This commit is contained in:
Jason Tibbitts 2021-11-01 16:35:33 -05:00
parent 4a171cb3bf
commit 4cf75bdaf9
1 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
macros.build-constraints
View File

@ -9,10 +9,24 @@
# If no options are passed, sets _smp_build_ncpus to 1.
# _smp_build_ncpus will never be raised, only lowered.
%constrain_build(c:m:) %{lua:
local mem_limit = math.tointeger(opt.m)
local cpu_limit = math.tointeger(opt.c)
local current_cpus = math.tointeger(macros._smp_build_ncpus)
local constrained_cpus = current_cpus
-- Check a value and clamp it to at least 1
local function check_and_clamp(v, string)
if v == nil then return nil end
i = math.tointeger(v)
if i == nil then
macros.error({"%%%0: invalid "..string.." value "..v})
return nil
end
local clamp = math.max(1, math.floor(i))
if i ~= clamp then
macros.error({"%%%0: invalid "..string.." value "..v})
return nil
end
return clamp
end
-- Parse meminfo to find the total amount of memory in the system
local function getmem()
@ -26,6 +40,11 @@
return mem
end
local mem_limit = check_and_clamp(opt.m, "mem limit")
local cpu_limit = check_and_clamp(opt.c, "cpu limit")
local current_cpus = math.tointeger(macros._smp_build_ncpus)
local constrained_cpus = current_cpus
if (not cpu_limit and not mem_limit) then
cpu_limit = 1
end