From 7e8491fdf7c589fa70ab4f783389258d951a6bd8 Mon Sep 17 00:00:00 2001
From: Abdessamad Derraz <3028866+Abdess@users.noreply.github.com>
Date: Thu, 26 Mar 2026 09:42:08 +0100
Subject: [PATCH] fix: resolve upstream core names to profile keys via reverse
 index

---
 scripts/common.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/scripts/common.py b/scripts/common.py
index b448dd0b..aefa4353 100644
--- a/scripts/common.py
+++ b/scripts/common.py
@@ -631,7 +631,18 @@ def resolve_platform_cores(
         }
 
     if target_cores is not None:
-        result = result & target_cores
+        # Build reverse index: upstream name -> profile key
+        # Upstream sources (buildbot, es_systems) may use different names
+        # than our profile keys (e.g., mednafen_psx vs beetle_psx).
+        # The profiles' cores: field lists these alternate names.
+        upstream_to_profile: dict[str, str] = {}
+        for name, p in profiles.items():
+            upstream_to_profile[name] = name
+            for alias in p.get("cores", []):
+                upstream_to_profile[str(alias)] = name
+        # Expand target_cores to profile keys
+        expanded = {upstream_to_profile.get(c, c) for c in target_cores}
+        result = result & expanded
     return result