* [PATCH V2] BaseTools:Enables FFS to support the GUID value format
@ 2019-05-09 11:58 Fan, ZhijuX
2019-05-09 14:06 ` Liming Gao
0 siblings, 1 reply; 2+ messages in thread
From: Fan, ZhijuX @ 2019-05-09 11:58 UTC (permalink / raw)
To: devel@edk2.groups.io; +Cc: Gao, Liming, Feng, Bob C
[-- Attachment #1: Type: text/plain, Size: 1552 bytes --]
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>
---
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
[-- Attachment #2: winmail.dat --]
[-- Type: application/ms-tnef, Size: 3958 bytes --]
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH V2] BaseTools:Enables FFS to support the GUID value format
2019-05-09 11:58 [PATCH V2] BaseTools:Enables FFS to support the GUID value format Fan, ZhijuX
@ 2019-05-09 14:06 ` Liming Gao
0 siblings, 0 replies; 2+ messages in thread
From: Liming Gao @ 2019-05-09 14:06 UTC (permalink / raw)
To: Fan, ZhijuX, devel@edk2.groups.io; +Cc: Feng, Bob C
Reviewed-by: Liming Gao <liming.gao@intel.com>
> -----Original Message-----
> From: Fan, ZhijuX
> Sent: Thursday, May 9, 2019 7:59 PM
> To: devel@edk2.groups.io
> Cc: Gao, Liming <liming.gao@intel.com>; Feng, Bob C <bob.c.feng@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.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> Signed-off-by: Zhiju.Fan <zhijux.fan@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
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-05-09 14:06 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-05-09 11:58 [PATCH V2] BaseTools:Enables FFS to support the GUID value format Fan, ZhijuX
2019-05-09 14:06 ` Liming Gao
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox