tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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 <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Signed-off-by: Zhiju.Fan <zhijux.fan@intel.com>
Reviewed-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
This commit is contained in:
Fan, ZhijuX 2019-05-09 19:58:32 +08:00 committed by Feng, Bob C
parent afe8c4110c
commit 6b74ccf0f8
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
BaseTools/Source/Python/GenFds/FdfParser.py
View File

@ -3605,7 +3605,12 @@ class FdfParser:
if not self._IsKeyword("$(NAMED_GUID)"): if not self._IsKeyword("$(NAMED_GUID)"):
if not self._GetNextWord(): 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 self._Token == 'PCD':
if not self._IsToken("("): if not self._IsToken("("):
raise Warning.Expected("'('", self.FileName, self.CurrentLineNumber) raise Warning.Expected("'('", self.FileName, self.CurrentLineNumber)