From 78054cddbfab8abf6f151eaf7f3903bf0e9129c2 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 14 Sep 2019 13:46:56 +0200
Subject: [PATCH] scripts: target_config_lib: fix inclusion of device-specific
packages from site.mk
Fixes: 071cf7b20f88 ("Switch to Lua for target definitions")
---
scripts/target_config_lib.lua | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/scripts/target_config_lib.lua b/scripts/target_config_lib.lua
index c06f1aec4..71443db77 100644
--- a/scripts/target_config_lib.lua
+++ b/scripts/target_config_lib.lua
@@ -16,15 +16,15 @@ return function(funcs)
end
- local function site_packages(profile)
+ local function site_packages(image)
return lib.exec_capture_raw(string.format([[
- MAKEFLAGS= make print PROFILE=%s --no-print-directory -s -f - <<'END_MAKE'
+ MAKEFLAGS= make print _GLUON_IMAGE_=%s --no-print-directory -s -f - <<'END_MAKE'
include $(GLUON_SITEDIR)/site.mk
print:
- echo -n '$(GLUON_$(PROFILE)_SITE_PACKAGES)'
+ echo -n '$(GLUON_$(_GLUON_IMAGE_)_SITE_PACKAGES)'
END_MAKE
- ]], lib.escape(profile)))
+ ]], lib.escape(image)))
end
lib.include('generic')
@@ -68,7 +68,7 @@ END_MAKE
for _, pkg in ipairs(dev.options.packages or {}) do
handle_pkg(pkg)
end
- for pkg in string.gmatch(site_packages(profile), '%S+') do
+ for pkg in string.gmatch(site_packages(dev.image), '%S+') do
handle_pkg(pkg)
end
--
GitLab