1. Patchew
  2. EDK2
  3. View series

[edk2] [Patch] BaseTools: Fix a bug for --pcd used in ConditionalStatement calculate

Yonghong Zhu posted 1 patch 6 years, 1 month ago
Failed in applying to current master (apply log)
BaseTools/Source/Python/GenFds/FdfParser.py         | 2 ++
BaseTools/Source/Python/GenFds/GenFds.py            | 2 +-
BaseTools/Source/Python/Workspace/MetaFileParser.py | 2 ++
3 files changed, 5 insertions(+), 1 deletion(-)
[edk2] [Patch] BaseTools: Fix a bug for --pcd used in ConditionalStatement calculate
Posted by Yonghong Zhu 6 years, 1 month ago 
Move the GlobalData.BuildOptionPcd before FdfParser() function and add
type check for Pcd item.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
---
 BaseTools/Source/Python/GenFds/FdfParser.py         | 2 ++
 BaseTools/Source/Python/GenFds/GenFds.py            | 2 +-
 BaseTools/Source/Python/Workspace/MetaFileParser.py | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py b/BaseTools/Source/Python/GenFds/FdfParser.py
index 76d7e6a..dda7ed4 100644
--- a/BaseTools/Source/Python/GenFds/FdfParser.py
+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
@@ -925,10 +925,12 @@ class FdfParser:
 
         MacroDict.update(GlobalData.gGlobalDefines)
         MacroDict.update(GlobalData.gCommandLineDefines)
         if GlobalData.BuildOptionPcd:
             for Item in GlobalData.BuildOptionPcd:
+                if type(Item) is tuple:
+                    continue
                 PcdName, TmpValue = Item.split("=")
                 TmpValue = BuildOptionValue(TmpValue, {})
                 MacroDict[PcdName.strip()] = TmpValue
         # Highest priority
 
diff --git a/BaseTools/Source/Python/GenFds/GenFds.py b/BaseTools/Source/Python/GenFds/GenFds.py
index 4c56cbb..03126e3 100644
--- a/BaseTools/Source/Python/GenFds/GenFds.py
+++ b/BaseTools/Source/Python/GenFds/GenFds.py
@@ -140,10 +140,11 @@ def main():
             if not os.path.exists(ActivePlatform)  :
                 EdkLogger.error("GenFds", FILE_NOT_FOUND, "ActivePlatform doesn't exist!")
         else:
             EdkLogger.error("GenFds", OPTION_MISSING, "Missing active platform")
 
+        GlobalData.BuildOptionPcd     = Options.OptionPcd if Options.OptionPcd else {}
         GenFdsGlobalVariable.ActivePlatform = PathClass(NormPath(ActivePlatform))
 
         if (Options.ConfDirectory):
             # Get alternate Conf location, if it is absolute, then just use the absolute directory name
             ConfDirectoryPath = os.path.normpath(Options.ConfDirectory)
@@ -324,11 +325,10 @@ def main():
                                         EdkLogger.error("GenFds", FORMAT_INVALID, "The FV %s's region is specified in multiple FD with different value." %FvObj.UiFvName)
                                 else:
                                     FvObj.FvRegionInFD = RegionObj.Size
                                     RegionObj.BlockInfoOfRegion(FdObj.BlockSizeList, FvObj)
 
-        GlobalData.BuildOptionPcd     = Options.OptionPcd if Options.OptionPcd else {}
         """Call GenFds"""
         GenFds.GenFd('', FdfParserObj, BuildWorkSpace, ArchList)
 
         """Generate GUID cross reference file"""
         GenFds.GenerateGuidXRefFile(BuildWorkSpace, ArchList, FdfParserObj)
diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py b/BaseTools/Source/Python/Workspace/MetaFileParser.py
index 69bdf21..2eb4c75 100644
--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
@@ -1243,10 +1243,12 @@ class DscParser(MetaFileParser):
         # PCD cannot be referenced in macro definition
         if self._ItemType not in [MODEL_META_DATA_DEFINE, MODEL_META_DATA_GLOBAL_DEFINE]:
             Macros.update(self._Symbols)
         if GlobalData.BuildOptionPcd:
             for Item in GlobalData.BuildOptionPcd:
+                if type(Item) is tuple:
+                    continue
                 PcdName, TmpValue = Item.split("=")
                 TmpValue = BuildOptionValue(TmpValue, self._GuidDict)
                 Macros[PcdName.strip()] = TmpValue
         return Macros
 
-- 
2.6.1.windows.1

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [Patch] BaseTools: Fix a bug for --pcd used in ConditionalStatement calculate
Posted by Gao, Liming 6 years, 1 month ago 
Reviewed-by: Liming Gao <liming.gao@intel.com>

>-----Original Message-----
>From: edk2-devel [mailto:edk2-devel-bounces@lists.01.org] On Behalf Of
>Yonghong Zhu
>Sent: Friday, March 09, 2018 3:19 PM
>To: edk2-devel@lists.01.org
>Subject: [edk2] [Patch] BaseTools: Fix a bug for --pcd used in
>ConditionalStatement calculate
>
>Move the GlobalData.BuildOptionPcd before FdfParser() function and add
>type check for Pcd item.
>
>Contributed-under: TianoCore Contribution Agreement 1.1
>Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
>---
> BaseTools/Source/Python/GenFds/FdfParser.py         | 2 ++
> BaseTools/Source/Python/GenFds/GenFds.py            | 2 +-
> BaseTools/Source/Python/Workspace/MetaFileParser.py | 2 ++
> 3 files changed, 5 insertions(+), 1 deletion(-)
>
>diff --git a/BaseTools/Source/Python/GenFds/FdfParser.py
>b/BaseTools/Source/Python/GenFds/FdfParser.py
>index 76d7e6a..dda7ed4 100644
>--- a/BaseTools/Source/Python/GenFds/FdfParser.py
>+++ b/BaseTools/Source/Python/GenFds/FdfParser.py
>@@ -925,10 +925,12 @@ class FdfParser:
>
>         MacroDict.update(GlobalData.gGlobalDefines)
>         MacroDict.update(GlobalData.gCommandLineDefines)
>         if GlobalData.BuildOptionPcd:
>             for Item in GlobalData.BuildOptionPcd:
>+                if type(Item) is tuple:
>+                    continue
>                 PcdName, TmpValue = Item.split("=")
>                 TmpValue = BuildOptionValue(TmpValue, {})
>                 MacroDict[PcdName.strip()] = TmpValue
>         # Highest priority
>
>diff --git a/BaseTools/Source/Python/GenFds/GenFds.py
>b/BaseTools/Source/Python/GenFds/GenFds.py
>index 4c56cbb..03126e3 100644
>--- a/BaseTools/Source/Python/GenFds/GenFds.py
>+++ b/BaseTools/Source/Python/GenFds/GenFds.py
>@@ -140,10 +140,11 @@ def main():
>             if not os.path.exists(ActivePlatform)  :
>                 EdkLogger.error("GenFds", FILE_NOT_FOUND, "ActivePlatform
>doesn't exist!")
>         else:
>             EdkLogger.error("GenFds", OPTION_MISSING, "Missing active
>platform")
>
>+        GlobalData.BuildOptionPcd     = Options.OptionPcd if Options.OptionPcd
>else {}
>         GenFdsGlobalVariable.ActivePlatform =
>PathClass(NormPath(ActivePlatform))
>
>         if (Options.ConfDirectory):
>             # Get alternate Conf location, if it is absolute, then just use the absolute
>directory name
>             ConfDirectoryPath = os.path.normpath(Options.ConfDirectory)
>@@ -324,11 +325,10 @@ def main():
>                                         EdkLogger.error("GenFds", FORMAT_INVALID, "The
>FV %s's region is specified in multiple FD with different
>value." %FvObj.UiFvName)
>                                 else:
>                                     FvObj.FvRegionInFD = RegionObj.Size
>                                     RegionObj.BlockInfoOfRegion(FdObj.BlockSizeList, FvObj)
>
>-        GlobalData.BuildOptionPcd     = Options.OptionPcd if Options.OptionPcd
>else {}
>         """Call GenFds"""
>         GenFds.GenFd('', FdfParserObj, BuildWorkSpace, ArchList)
>
>         """Generate GUID cross reference file"""
>         GenFds.GenerateGuidXRefFile(BuildWorkSpace, ArchList, FdfParserObj)
>diff --git a/BaseTools/Source/Python/Workspace/MetaFileParser.py
>b/BaseTools/Source/Python/Workspace/MetaFileParser.py
>index 69bdf21..2eb4c75 100644
>--- a/BaseTools/Source/Python/Workspace/MetaFileParser.py
>+++ b/BaseTools/Source/Python/Workspace/MetaFileParser.py
>@@ -1243,10 +1243,12 @@ class DscParser(MetaFileParser):
>         # PCD cannot be referenced in macro definition
>         if self._ItemType not in [MODEL_META_DATA_DEFINE,
>MODEL_META_DATA_GLOBAL_DEFINE]:
>             Macros.update(self._Symbols)
>         if GlobalData.BuildOptionPcd:
>             for Item in GlobalData.BuildOptionPcd:
>+                if type(Item) is tuple:
>+                    continue
>                 PcdName, TmpValue = Item.split("=")
>                 TmpValue = BuildOptionValue(TmpValue, self._GuidDict)
>                 Macros[PcdName.strip()] = TmpValue
>         return Macros
>
>--
>2.6.1.windows.1
>
>_______________________________________________
>edk2-devel mailing list
>edk2-devel@lists.01.org
>https://lists.01.org/mailman/listinfo/edk2-devel
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.