From 89efe55c7c9a2e137ba1b90dd747724896ef3f37 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Sun, 3 May 2020 17:13:42 +0200 Subject: [PATCH] build: implement image site_packages using a generic site_var function --- scripts/target_config_lib.lua | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/target_config_lib.lua b/scripts/target_config_lib.lua index e2abb76b..c52b7e30 100644 --- a/scripts/target_config_lib.lua +++ b/scripts/target_config_lib.lua @@ -20,15 +20,19 @@ return function(funcs) end - local function site_packages(image) + local function site_vars(var) 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 print: - echo -n '$(GLUON_$(_GLUON_IMAGE_)_SITE_PACKAGES)' + echo -n '$(_GLUON_SITE_VARS_)' 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 local function handle_target_pkgs(pkgs)