From 33e58db9e21e04b831fa23ea6f1f546003ae0444 Mon Sep 17 00:00:00 2001
From: Michael Kubacki <michael.kubacki@microsoft.com>
Date: Mon, 23 Jun 2025 11:22:49 -0400
Subject: [PATCH] OvmfPkg: Pass command-line args to PR Eval

Allow PR eval to operate with the same input variable values as the
build command would.

Signed-off-by: Michael Kubacki <michael.kubacki@microsoft.com>
---
 OvmfPkg/PlatformCI/PlatformBuildLib.py | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/OvmfPkg/PlatformCI/PlatformBuildLib.py b/OvmfPkg/PlatformCI/PlatformBuildLib.py
index 19f92ac13f..6e0b9e4f51 100644
--- a/OvmfPkg/PlatformCI/PlatformBuildLib.py
+++ b/OvmfPkg/PlatformCI/PlatformBuildLib.py
@@ -110,8 +110,21 @@ class SettingsManager(UpdateSettingsManager, SetupSettingsManager, PrEvalSetting
 
         The tuple should be (<workspace relative path to dsc file>, <input dictionary of dsc key value pairs>)
         '''
+        import re
+        import sys
+
+        cmd_line_input_vars = {}
+        for arg in sys.argv:
+            if "=" in arg:
+                key, value = arg.split("=", 1)
+                if key.startswith("-"):
+                    continue
+                if re.match(r"BLD_.+_", key):
+                    key = re.sub(r"^BLD_.+?_", "", key, count=1)
+                cmd_line_input_vars[key] = value
+
         dsc = CommonPlatform.GetDscName(",".join(self.ActualArchitectures))
-        return (f"OvmfPkg/{dsc}", {})
+        return (f"OvmfPkg/{dsc}", cmd_line_input_vars)
 
 
     # ####################################################################################### #