Reviewed-by: Liming Gao <liming....@intel.com> > -----Original Message----- > From: Fan, ZhijuX > Sent: Thursday, May 9, 2019 7:59 PM > To: devel@edk2.groups.io > Cc: Gao, Liming <liming....@intel.com>; Feng, Bob C <bob.c.f...@intel.com> > Subject: [PATCH V2] 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.f...@intel.com> > Cc: Liming Gao <liming....@intel.com> > Signed-off-by: Zhiju.Fan <zhijux....@intel.com> > --- > 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.14.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#40362): https://edk2.groups.io/g/devel/message/40362 Mute This Topic: https://groups.io/mt/31554291/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-
