From 274db1322f2aad8c789903e47745a2e3fbf8577d Mon Sep 17 00:00:00 2001 From: Abdessamad Derraz <3028866+Abdess@users.noreply.github.com> Date: Tue, 20 Oct 2026 08:12:03 +0200 Subject: [PATCH] fix: the second extras pass reads installed marks A file a core reads at several destinations is added again at each one by a second pass that worked from the raw profile entries, so files the emulator or the platform's package installs came back into the packs and manifests by that route: the installer's per-target replay disagreed with the builder on six files. --- scripts/packextras.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/scripts/packextras.py b/scripts/packextras.py index aaeb42b1..e32dab34 100644 --- a/scripts/packextras.py +++ b/scripts/packextras.py @@ -19,7 +19,7 @@ from common import platform_layouts from common import standalone_set as platform_standalone_set from common import sanitize_pack_path from common import size_fits -from validation import read_from_system_dir +from validation import deliverable, read_from_system_dir from region import FILE_GROUP @@ -956,6 +956,10 @@ def _collect_emulator_extras( # covered elsewhere belongs to another program's file. if fname not in covered_names or f.get("unsourceable"): continue + # Installed with the emulator or by the platform's package, + # as the first pass already decided for the same entry. + if not deliverable([f], is_standalone, config.get("_key", "")): + continue # A member of an archive is read inside it, never as a loose # file. The archive itself is placed by the passes above. if f.get("archive"):