nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

scrtips/target_config_lib: add new function devpkgs(dev)

Browse Source 
this moves the transformation of "dev.options.packages" and
"site_packages(dev.image)" to a string ps packages from the
main code.
As the main-code gets a single string with all packages, it
does not need to evaluate the pkg-sources again.
This commit is contained in:
Sven Roederer 2020-03-04 23:24:48 +01:00 committed by Sven Roederer
parent c53b327176
commit e2e7ecb4c8
1 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
scripts/target_config_lib.lua
View File

@ -65,9 +65,24 @@ END_MAKE
end end
end end
local function devpkgs(dev)
io.stderr:write(string.format("called target_config_lib.lua:devpkgs(%s)\n", dev.name))
local device_pkgs = default_pkgs
for _, pkg in ipairs(dev.options.packages or {}) do
device_pkgs = device_pkgs .. ' ' .. pkg
end
for pkg in string.gmatch(site_packages(dev.image), '%S+') do
device_pkgs = device_pkgs .. ' ' .. pkg
end
io.stderr:write(string.format("debug_a: %s\n", device_pkgs))
return(device_pkgs)
end
for _, dev in ipairs(lib.devices) do for _, dev in ipairs(lib.devices) do
local profile = dev.options.profile or dev.name local profile = dev.options.profile or dev.name
local device_pkgs = default_pkgs local device_pkgs = devpkgs(dev)
local function handle_pkg(pkg) local function handle_pkg(pkg)
if string.sub(pkg, 1, 1) ~= '-' then if string.sub(pkg, 1, 1) ~= '-' then
@ -78,10 +93,7 @@ END_MAKE
io.stderr:write("debug: in for _, dev in ipairs(lib.devices) for profile " .. profile .. "\n") io.stderr:write("debug: in for _, dev in ipairs(lib.devices) for profile " .. profile .. "\n")
for _, pkg in ipairs(dev.options.packages or {}) do for pkg in string.gmatch(device_pkgs, '%S+') do
handle_pkg(pkg)
end
for pkg in string.gmatch(site_packages(dev.image), '%S+') do
handle_pkg(pkg) handle_pkg(pkg)
end end