owut: fix processing of device defaults

Some device profiles specify the removal of subtarget default packages. We were ignoring this, resulting in the removed package being included, and also giving bad informational messages about the package. Fixes: #30 Signed-off-by: Eric Fahlgren <[email protected]>
efahl · Jan 25, 2025 · a95d383 · a95d383
1 parent eaca182
commit a95d383
Showing 1 changed file with 12 additions and 1 deletion.
diff --git a/files/owut b/files/owut
@@ -893,7 +893,18 @@ function collect_defaults(board, device)
 	// Use both board json for its defaults, then add the device-specific
 	// defaults to make one big defaults list.
 
-	let defaults = [...board, ...device];
+	let defaults = []; // Must filter out and device-specific removals.
+	for (let pkg in board) {
+		if (! ("-"+pkg in device)) {
+			push(defaults, pkg);
+		}
+	}
+	for (let pkg in device) {
+		if (! match(pkg, /^-/)) {
+			push(defaults, pkg);
+		}
+	}
+
 	for (let pkg in packages.non_upgradable) {
 		if (! (pkg in defaults)) push(defaults, pkg);
 	}