diff options
| author | Fan, ZhijuX <zhijux.fan@intel.com> | 2019-05-09 19:58:32 +0800 |
|---|---|---|
| committer | Feng, Bob C <bob.c.feng@intel.com> | 2019-05-10 17:07:07 +0800 |
| commit | 6b74ccf0f8b53256b696ce921d50b873f6f9db57 (patch) | |
| tree | 95392e7b3b4f6d6c280fddbada133415f13a6f6c | |
| parent | afe8c4110c072126b9fb3821397a0216bf7dd8ad (diff) | |
| download | edk2-6b74ccf0f8b53256b696ce921d50b873f6f9db57.tar.gz edk2-6b74ccf0f8b53256b696ce921d50b873f6f9db57.tar.bz2 edk2-6b74ccf0f8b53256b696ce921d50b873f6f9db57.zip | |
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>
| -rw-r--r-- | BaseTools/Source/Python/GenFds/FdfParser.py | 7 |
1 files changed, 6 insertions, 1 deletions
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)
|