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

build: implement image site_packages using a generic site_var function

Browse Source
This commit is contained in:
Matthias Schiffer 2020-05-03 17:13:42 +02:00
parent 9b19883d97
commit 89efe55c7c
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/target_config_lib.lua
View File

@ -20,15 +20,19 @@ return function(funcs)
end end
local function site_packages(image) local function site_vars(var)
return lib.exec_capture_raw(string.format([[ return lib.exec_capture_raw(string.format([[
MAKEFLAGS= make print _GLUON_IMAGE_=%s --no-print-directory -s -f - <<'END_MAKE' MAKEFLAGS= make print _GLUON_SITE_VARS_=%s --no-print-directory -s -f - <<'END_MAKE'
include $(GLUON_SITEDIR)/site.mk include $(GLUON_SITEDIR)/site.mk
print: print:
echo -n '$(GLUON_$(_GLUON_IMAGE_)_SITE_PACKAGES)' echo -n '$(_GLUON_SITE_VARS_)'
END_MAKE END_MAKE
]], lib.escape(image))) ]], lib.escape(var)))
end
local function site_packages(image)
return site_vars(string.format('$(GLUON_%s_SITE_PACKAGES)', image))
end end
local function handle_target_pkgs(pkgs) local function handle_target_pkgs(pkgs)