fixup! build: allow modification of device build-properties

freifunk-gluon · Dec 9, 2023 · 7935eee · 7935eee
1 parent 1214315
commit 7935eee
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/scripts/image_customization_lib.lua b/scripts/image_customization_lib.lua
@@ -8,7 +8,9 @@ local function collect_keys(t)
 	return ret
 end
 
-local function evaluate_device(files, env, dev)
+local function evaluate_device(env, dev)
+	local files = {env.GLUON_SITEDIR .. '/image-customization'}
+
 	local selections = {}
 	local funcs = {}
 	local device_overrides = {}
@@ -100,12 +102,12 @@ local function evaluate_device(files, env, dev)
 	}
 end
 
-function M.get_selection(selection_type, files, env, dev)
+function M.get_selection(selection_type, env, dev)
 	local eval_result = evaluate_device(files, env, dev)
 	return collect_keys(eval_result.selections[selection_type] or {})
 end
 
-function M.device_overrides(files, env, dev)
+function M.device_overrides(env, dev)
 	local eval_result = evaluate_device(files, env, dev)
 	return eval_result.device_overrides
 end

diff --git a/scripts/target_config_lib.lua b/scripts/target_config_lib.lua
@@ -87,23 +87,21 @@ local function feature_packages(features)
 end
 
 local function site_specific_packages(dev_info)
-	local image_custoization = env.GLUON_SITEDIR .. '/image-customization'
-
 	local site_packages = {}
 	local feature_inherited_pkgs = {}
 
 	if file_exists(image_custoization) then
 		local site_features
 
 		-- First read enabled features from site
-		site_features = image_customization_lib.get_selection('feature', {image_custoization}, env, dev_info)
+		site_features = image_customization_lib.get_selection('feature', env, dev_info)
 		site_features = compact_list(site_features, false)
 
 		-- Create List from packages inherited from features
 		feature_inherited_pkgs = feature_packages(site_features)
 
 		-- Read list of packages from site
-		site_packages = image_customization_lib.get_selection('package', {image_custoization}, env, dev_info)
+		site_packages = image_customization_lib.get_selection('package',  env, dev_info)
 	end
 
 	-- Concat feature-packages with site-packages

diff --git a/scripts/target_lib.lua b/scripts/target_lib.lua
@@ -56,7 +56,6 @@ function F.istrue(v)
 end
 
 local function get_device_overrides(device_info)
-	local image_customization = env.GLUON_SITEDIR .. '/image-customization'
 	local image_customization_lib = dofile('scripts/image_customization_lib.lua')
 	local overrides = image_customization_lib.device_overrides({image_customization}, env, device_info)
 	return overrides