From bff9815b616669f1cf743e412bc0000efe22dfb4 Mon Sep 17 00:00:00 2001 From: Michael Kubacki Date: Thu, 15 Feb 2024 15:39:10 -0500 Subject: BaseTools/GenFds: Resolve absolute workspace INF paths Currently, if an INF path is an absolute path on Linux (begins with "/"), the "/" character will be removed. If the path is an absolute system path, this creates an invalid path. An example of when this may be an issue is in external dependencies where an INF is within the external dependency, the `set_build_var` flag is set, and DSC files refer to files by its build variable (e.g. `$(SHARED_BINARIES)/Module.inf`). INFs in a binary distribution like this example may contain a [Binaries] section and refer to different section files that can be used by a platform to compose an FFS file. For example, the PE32 (.efi) and DEPEX (.depex) files. In this case, `$(SHARED_BINARIES)` will be an absolute path to the ext dep directory and `FfsInfStatement.__InfParse__` will remove the leading "/" character so the path is invalid. This change first checks if the absolute path will resolve into the current workspace. If it does (as will happen in the shared crypto ext dep example above), it modifies the path to be relative to the workspace so later logic dependent on relative paths can operate on it. If the absolute path is not within the current workspace, it follows previous behavior for backward compatibility to that scenario. Cc: Rebecca Cran Cc: Liming Gao Cc: Bob Feng Cc: Yuwei Chen Signed-off-by: Michael Kubacki Reviewed-by: Rebecca Cran --- BaseTools/Source/Python/GenFds/FfsInfStatement.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'BaseTools') diff --git a/BaseTools/Source/Python/GenFds/FfsInfStatement.py b/BaseTools/Source/Python/GenFds/FfsInfStatement.py index 568efb6d76..6550d939d4 100644 --- a/BaseTools/Source/Python/GenFds/FfsInfStatement.py +++ b/BaseTools/Source/Python/GenFds/FfsInfStatement.py @@ -19,6 +19,7 @@ from .GenFdsGlobalVariable import GenFdsGlobalVariable from .Ffs import SectionSuffix,FdfFvFileTypeToFileType import subprocess import sys +from pathlib import Path from . import Section from . import RuleSimpleFile from . import RuleComplexFile @@ -156,7 +157,12 @@ class FfsInfStatement(FfsInfStatementClassObject): if len(self.InfFileName) > 1 and self.InfFileName[0] == '\\' and self.InfFileName[1] == '\\': pass elif self.InfFileName[0] == '\\' or self.InfFileName[0] == '/' : - self.InfFileName = self.InfFileName[1:] + ws_path = Path(GenFdsGlobalVariable.WorkSpaceDir) + inf_path = Path(self.InfFileName) + if ws_path in inf_path.parents: + self.InfFileName = str(inf_path.relative_to(ws_path)) + else: + self.InfFileName = self.InfFileName[1:] if self.InfFileName.find('$') == -1: InfPath = NormPath(self.InfFileName) -- cgit v1.2.3