[v1] BaseTools:Enables FFS to support the GUID value format

[edk2-devel] [PATCH] BaseTools:Enables FFS to support the GUID value format

Fan, ZhijuX posted 1 patch 4 years, 11 months ago

Diff against v2
Download mbox

Failed in applying to current master (apply log)

There is a newer version of this series

BaseTools/Source/Python/GenFds/FdfParser.py | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)

Expand all Fold all

[edk2-devel] [PATCH] BaseTools:Enables FFS to support the GUID value format

Posted by Fan, ZhijuX 4 years, 11 months ago

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 | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 54f61ae05e..aab64d6833 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -990,7 +990,7 @@ class FdfParser:
 
         TempChar = self._CurrentChar()
         StartPos = self.CurrentOffsetWithinLine
-        if (TempChar >= 'a' and TempChar <= 'z') or (TempChar >= 'A' and TempChar <= 'Z') or TempChar == '_':
+        if (TempChar >= 'a' and TempChar <= 'z') or (TempChar >= 'A' and TempChar <= 'Z') or (TempChar >= '0' and TempChar <= '9') or TempChar == '_':
             self._GetOneChar()
             while not self._EndOfLine():
                 TempChar = self._CurrentChar()
@@ -1002,6 +1002,8 @@ class FdfParser:
                     break
 
             self._Token = self._CurrentLine()[StartPos: self.CurrentOffsetWithinLine]
+            if (TempChar >= '0' and TempChar <= '9') and not GlobalData.gGuidPattern.search(self._Token):
+                return False
             return True
 
         return False
-- 
2.14.1.windows.1


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.

View/Reply Online (#40312): https://edk2.groups.io/g/devel/message/40312
Mute This Topic: https://groups.io/mt/31553425/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-