From 6b74ccf0f8b53256b696ce921d50b873f6f9db57 Mon Sep 17 00:00:00 2001 From: "Fan, ZhijuX" Date: Thu, 9 May 2019 19:58:32 +0800 Subject: [PATCH] BaseTools:Enables FFS to support the GUID value format BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1768 Per FDF spec, FFS Rule can specify the hard code FILE Guid value. But,BaseTools reports the build failure.It should be fixed. This patch is going to fix that issue. Cc: Bob Feng Cc: Liming Gao Signed-off-by: Zhiju.Fan Reviewed-by: Liming Gao Reviewed-by: Bob Feng --- BaseTools/Source/Python/GenFds/FdfParser.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py index 54f61ae05e..ea1c3eeb30 100644 --- a/BaseTools/Source/Python/GenFds/FdfParser.py +++ b/BaseTools/Source/Python/GenFds/FdfParser.py @@ -3605,7 +3605,12 @@ class FdfParser: if not self._IsKeyword("$(NAMED_GUID)"): if not self._GetNextWord(): - raise Warning.Expected("$(NAMED_GUID)", self.FileName, self.CurrentLineNumber) + NamedGuid = self._CurrentLine()[self.CurrentOffsetWithinLine:].split()[0].strip() + if GlobalData.gGuidPatternEnd.match(NamedGuid): + self.CurrentOffsetWithinLine += len(NamedGuid) + self._Token = NamedGuid + else: + raise Warning.Expected("$(NAMED_GUID)", self.FileName, self.CurrentLineNumber) if self._Token == 'PCD': if not self._IsToken("("): raise Warning.Expected("'('", self.FileName, self.CurrentLineNumber) -- 2.39.2