1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [Patch][edk2-stable201908] BaseTools: Incorrect error message for library instance not found

Bob Feng posted 1 patch 4 years, 8 months ago
Failed in applying to current master (apply log)
There is a newer version of this series
BaseTools/Source/Python/AutoGen/DataPipe.py          | 2 +-
BaseTools/Source/Python/AutoGen/PlatformAutoGen.py   | 2 +-
BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py  | 4 +++-
BaseTools/Source/Python/Workspace/WorkspaceCommon.py | 3 ++-
4 files changed, 7 insertions(+), 4 deletions(-)
[edk2-devel] [Patch][edk2-stable201908] BaseTools: Incorrect error message for library instance not found
Posted by Bob Feng 4 years, 8 months ago 
BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2099
This is a regression issue introduced by commit e8449e.

This patch is to fix this issue.

Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
---
 BaseTools/Source/Python/AutoGen/DataPipe.py          | 2 +-
 BaseTools/Source/Python/AutoGen/PlatformAutoGen.py   | 2 +-
 BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py  | 4 +++-
 BaseTools/Source/Python/Workspace/WorkspaceCommon.py | 3 ++-
 4 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/BaseTools/Source/Python/AutoGen/DataPipe.py b/BaseTools/Source/Python/AutoGen/DataPipe.py
index 2ca4f9ff4a..8b8cfd1c51 100755
--- a/BaseTools/Source/Python/AutoGen/DataPipe.py
+++ b/BaseTools/Source/Python/AutoGen/DataPipe.py
@@ -87,11 +87,11 @@ class MemoryDataPipe(DataPipe):
         #Module's Library Instance
         ModuleLibs = {}
         libModules = {}
         for m in PlatformInfo.Platform.Modules:
             module_obj = BuildDB.BuildObject[m,PlatformInfo.Arch,PlatformInfo.BuildTarget,PlatformInfo.ToolChain]
-            Libs = GetModuleLibInstances(module_obj, PlatformInfo.Platform, BuildDB.BuildObject, PlatformInfo.Arch,PlatformInfo.BuildTarget,PlatformInfo.ToolChain)
+            Libs = GetModuleLibInstances(module_obj, PlatformInfo.Platform, BuildDB.BuildObject, PlatformInfo.Arch,PlatformInfo.BuildTarget,PlatformInfo.ToolChain,PlatformInfo.MetaFile,EdkLogger)
             for lib in Libs:
                 try:
                     libModules[(lib.MetaFile.File,lib.MetaFile.Root,lib.Arch,lib.MetaFile.Path)].append((m.File,m.Root,module_obj.Arch,m.Path))
                 except:
                     libModules[(lib.MetaFile.File,lib.MetaFile.Root,lib.Arch,lib.MetaFile.Path)] = [(m.File,m.Root,module_obj.Arch,m.Path)]
diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
index dd629ba2fa..565424a95e 100644
--- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
@@ -1087,11 +1087,11 @@ class PlatformAutoGen(AutoGen):
     def GetAllModuleInfo(self,WithoutPcd=True):
         ModuleLibs = set()
         for m in self.Platform.Modules:
             module_obj = self.BuildDatabase[m,self.Arch,self.BuildTarget,self.ToolChain]
             if not bool(module_obj.LibraryClass):
-                Libs = GetModuleLibInstances(module_obj, self.Platform, self.BuildDatabase, self.Arch,self.BuildTarget,self.ToolChain)
+                Libs = GetModuleLibInstances(module_obj, self.Platform, self.BuildDatabase, self.Arch,self.BuildTarget,self.ToolChain,self.MetaFile,EdkLogger)
             else:
                 Libs = []
             ModuleLibs.update( set([(l.MetaFile.File,l.MetaFile.Root,l.MetaFile.Path,l.MetaFile.BaseName,l.MetaFile.OriginalPath,l.Arch,True) for l in Libs]))
             if WithoutPcd and module_obj.PcdIsDriver:
                 continue
diff --git a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
index ea0d8f8bfb..2494267472 100644
--- a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
@@ -246,11 +246,13 @@ class WorkspaceAutoGen(AutoGen):
                 if BuildData.MetaFile.Ext == '.inf' and str(BuildData) in Platform.Modules :
                     Libs.extend(GetModuleLibInstances(BuildData, Platform,
                                      self.BuildDatabase,
                                      Arch,
                                      self.BuildTarget,
-                                     self.ToolChain
+                                     self.ToolChain,
+                                     self.Platform.MetaFile,
+                                     EdkLogger
                                      ))
             for BuildData in list(self.BuildDatabase._CACHE_.values()):
                 if BuildData.Arch != Arch:
                     continue
                 if BuildData.MetaFile.Ext == '.inf':
diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
index 76583f46e5..cbbd550dbd 100644
--- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
+++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
@@ -13,10 +13,11 @@ from .BuildClassObject import LibraryClassObject
 import Common.GlobalData as GlobalData
 from Workspace.BuildClassObject import StructurePcd
 from Common.BuildToolError import RESOURCE_NOT_AVAILABLE
 from Common.BuildToolError import OPTION_MISSING
 from Common.BuildToolError import BUILD_ERROR
+import Common.EdkLogger as EdkLogger
 
 class OrderedListDict(OrderedDict):
     def __init__(self, *args, **kwargs):
         super(OrderedListDict, self).__init__(*args, **kwargs)
         self.default_factory = list
@@ -83,11 +84,11 @@ def GetDeclaredPcd(Platform, BuildDatabase, Arch, Target, Toolchain, additionalP
 #  @param Target: Current target
 #  @param Toolchain: Current toolchain
 #  @retval: List of dependent libraries which are InfBuildData instances
 #
 def GetLiabraryInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain):
-    return GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain)
+    return GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain,Platform.MetaFile,EdkLogger)
 
 def GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain, FileName = '', EdkLogger = None):
     if Module.LibInstances:
         return Module.LibInstances
     ModuleType = Module.ModuleType
-- 
2.20.1.windows.1


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

View/Reply Online (#46133): https://edk2.groups.io/g/devel/message/46133
Mute This Topic: https://groups.io/mt/32975835/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Incorrect error message for library instance not found
Posted by Liming Gao 4 years, 7 months ago 
Bob:
  After I apply this patch, I will meet with build failure to build -p MdePkg\MdePkg.dsc. Can you help check it?

Thanks
Liming
> -----Original Message-----
> From: Feng, Bob C
> Sent: Wednesday, August 21, 2019 2:27 PM
> To: devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming <liming.gao@intel.com>
> Subject: [Patch][edk2-stable201908] BaseTools: Incorrect error message for library instance not found
> 
> BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2099
> This is a regression issue introduced by commit e8449e.
> 
> This patch is to fix this issue.
> 
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> ---
>  BaseTools/Source/Python/AutoGen/DataPipe.py          | 2 +-
>  BaseTools/Source/Python/AutoGen/PlatformAutoGen.py   | 2 +-
>  BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py  | 4 +++-
>  BaseTools/Source/Python/Workspace/WorkspaceCommon.py | 3 ++-
>  4 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/DataPipe.py b/BaseTools/Source/Python/AutoGen/DataPipe.py
> index 2ca4f9ff4a..8b8cfd1c51 100755
> --- a/BaseTools/Source/Python/AutoGen/DataPipe.py
> +++ b/BaseTools/Source/Python/AutoGen/DataPipe.py
> @@ -87,11 +87,11 @@ class MemoryDataPipe(DataPipe):
>          #Module's Library Instance
>          ModuleLibs = {}
>          libModules = {}
>          for m in PlatformInfo.Platform.Modules:
>              module_obj = BuildDB.BuildObject[m,PlatformInfo.Arch,PlatformInfo.BuildTarget,PlatformInfo.ToolChain]
> -            Libs = GetModuleLibInstances(module_obj, PlatformInfo.Platform, BuildDB.BuildObject,
> PlatformInfo.Arch,PlatformInfo.BuildTarget,PlatformInfo.ToolChain)
> +            Libs = GetModuleLibInstances(module_obj, PlatformInfo.Platform, BuildDB.BuildObject,
> PlatformInfo.Arch,PlatformInfo.BuildTarget,PlatformInfo.ToolChain,PlatformInfo.MetaFile,EdkLogger)
>              for lib in Libs:
>                  try:
> 
> libModules[(lib.MetaFile.File,lib.MetaFile.Root,lib.Arch,lib.MetaFile.Path)].append((m.File,m.Root,module_obj.Arch,m.Path))
>                  except:
>                      libModules[(lib.MetaFile.File,lib.MetaFile.Root,lib.Arch,lib.MetaFile.Path)] =
> [(m.File,m.Root,module_obj.Arch,m.Path)]
> diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> index dd629ba2fa..565424a95e 100644
> --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> @@ -1087,11 +1087,11 @@ class PlatformAutoGen(AutoGen):
>      def GetAllModuleInfo(self,WithoutPcd=True):
>          ModuleLibs = set()
>          for m in self.Platform.Modules:
>              module_obj = self.BuildDatabase[m,self.Arch,self.BuildTarget,self.ToolChain]
>              if not bool(module_obj.LibraryClass):
> -                Libs = GetModuleLibInstances(module_obj, self.Platform, self.BuildDatabase, self.Arch,self.BuildTarget,self.ToolChain)
> +                Libs = GetModuleLibInstances(module_obj, self.Platform, self.BuildDatabase,
> self.Arch,self.BuildTarget,self.ToolChain,self.MetaFile,EdkLogger)
>              else:
>                  Libs = []
> 
> ModuleLibs.update( set([(l.MetaFile.File,l.MetaFile.Root,l.MetaFile.Path,l.MetaFile.BaseName,l.MetaFile.OriginalPath,l.Arch,True) for l in
> Libs]))
>              if WithoutPcd and module_obj.PcdIsDriver:
>                  continue
> diff --git a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
> index ea0d8f8bfb..2494267472 100644
> --- a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
> @@ -246,11 +246,13 @@ class WorkspaceAutoGen(AutoGen):
>                  if BuildData.MetaFile.Ext == '.inf' and str(BuildData) in Platform.Modules :
>                      Libs.extend(GetModuleLibInstances(BuildData, Platform,
>                                       self.BuildDatabase,
>                                       Arch,
>                                       self.BuildTarget,
> -                                     self.ToolChain
> +                                     self.ToolChain,
> +                                     self.Platform.MetaFile,
> +                                     EdkLogger
>                                       ))
>              for BuildData in list(self.BuildDatabase._CACHE_.values()):
>                  if BuildData.Arch != Arch:
>                      continue
>                  if BuildData.MetaFile.Ext == '.inf':
> diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
> index 76583f46e5..cbbd550dbd 100644
> --- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
> +++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
> @@ -13,10 +13,11 @@ from .BuildClassObject import LibraryClassObject
>  import Common.GlobalData as GlobalData
>  from Workspace.BuildClassObject import StructurePcd
>  from Common.BuildToolError import RESOURCE_NOT_AVAILABLE
>  from Common.BuildToolError import OPTION_MISSING
>  from Common.BuildToolError import BUILD_ERROR
> +import Common.EdkLogger as EdkLogger
> 
>  class OrderedListDict(OrderedDict):
>      def __init__(self, *args, **kwargs):
>          super(OrderedListDict, self).__init__(*args, **kwargs)
>          self.default_factory = list
> @@ -83,11 +84,11 @@ def GetDeclaredPcd(Platform, BuildDatabase, Arch, Target, Toolchain, additionalP
>  #  @param Target: Current target
>  #  @param Toolchain: Current toolchain
>  #  @retval: List of dependent libraries which are InfBuildData instances
>  #
>  def GetLiabraryInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain):
> -    return GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain)
> +    return GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain,Platform.MetaFile,EdkLogger)
> 
>  def GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain, FileName = '', EdkLogger = None):
>      if Module.LibInstances:
>          return Module.LibInstances
>      ModuleType = Module.ModuleType
> --
> 2.20.1.windows.1


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

View/Reply Online (#46152): https://edk2.groups.io/g/devel/message/46152
Mute This Topic: https://groups.io/mt/32975835/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub  [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Incorrect error message for library instance not found
Posted by Bob Feng 4 years, 7 months ago 
Yes. I'll double check this patch.

Thanks,
Bob

-----Original Message-----
From: Gao, Liming 
Sent: Wednesday, August 21, 2019 9:59 PM
To: Feng, Bob C <bob.c.feng@intel.com>; devel@edk2.groups.io
Subject: RE: [Patch][edk2-stable201908] BaseTools: Incorrect error message for library instance not found

Bob:
  After I apply this patch, I will meet with build failure to build -p MdePkg\MdePkg.dsc. Can you help check it?

Thanks
Liming
> -----Original Message-----
> From: Feng, Bob C
> Sent: Wednesday, August 21, 2019 2:27 PM
> To: devel@edk2.groups.io
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Gao, Liming 
> <liming.gao@intel.com>
> Subject: [Patch][edk2-stable201908] BaseTools: Incorrect error message 
> for library instance not found
> 
> BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=2099
> This is a regression issue introduced by commit e8449e.
> 
> This patch is to fix this issue.
> 
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <liming.gao@intel.com>
> ---
>  BaseTools/Source/Python/AutoGen/DataPipe.py          | 2 +-
>  BaseTools/Source/Python/AutoGen/PlatformAutoGen.py   | 2 +-
>  BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py  | 4 +++-  
> BaseTools/Source/Python/Workspace/WorkspaceCommon.py | 3 ++-
>  4 files changed, 7 insertions(+), 4 deletions(-)
> 
> diff --git a/BaseTools/Source/Python/AutoGen/DataPipe.py 
> b/BaseTools/Source/Python/AutoGen/DataPipe.py
> index 2ca4f9ff4a..8b8cfd1c51 100755
> --- a/BaseTools/Source/Python/AutoGen/DataPipe.py
> +++ b/BaseTools/Source/Python/AutoGen/DataPipe.py
> @@ -87,11 +87,11 @@ class MemoryDataPipe(DataPipe):
>          #Module's Library Instance
>          ModuleLibs = {}
>          libModules = {}
>          for m in PlatformInfo.Platform.Modules:
>              module_obj = BuildDB.BuildObject[m,PlatformInfo.Arch,PlatformInfo.BuildTarget,PlatformInfo.ToolChain]
> -            Libs = GetModuleLibInstances(module_obj, PlatformInfo.Platform, BuildDB.BuildObject,
> PlatformInfo.Arch,PlatformInfo.BuildTarget,PlatformInfo.ToolChain)
> +            Libs = GetModuleLibInstances(module_obj, 
> + PlatformInfo.Platform, BuildDB.BuildObject,
> PlatformInfo.Arch,PlatformInfo.BuildTarget,PlatformInfo.ToolChain,PlatformInfo.MetaFile,EdkLogger)
>              for lib in Libs:
>                  try:
> 
> libModules[(lib.MetaFile.File,lib.MetaFile.Root,lib.Arch,lib.MetaFile.Path)].append((m.File,m.Root,module_obj.Arch,m.Path))
>                  except:
>                      
> libModules[(lib.MetaFile.File,lib.MetaFile.Root,lib.Arch,lib.MetaFile.
> Path)] = [(m.File,m.Root,module_obj.Arch,m.Path)]
> diff --git a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py 
> b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> index dd629ba2fa..565424a95e 100644
> --- a/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/PlatformAutoGen.py
> @@ -1087,11 +1087,11 @@ class PlatformAutoGen(AutoGen):
>      def GetAllModuleInfo(self,WithoutPcd=True):
>          ModuleLibs = set()
>          for m in self.Platform.Modules:
>              module_obj = self.BuildDatabase[m,self.Arch,self.BuildTarget,self.ToolChain]
>              if not bool(module_obj.LibraryClass):
> -                Libs = GetModuleLibInstances(module_obj, self.Platform, self.BuildDatabase, self.Arch,self.BuildTarget,self.ToolChain)
> +                Libs = GetModuleLibInstances(module_obj, 
> + self.Platform, self.BuildDatabase,
> self.Arch,self.BuildTarget,self.ToolChain,self.MetaFile,EdkLogger)
>              else:
>                  Libs = []
> 
> ModuleLibs.update( 
> set([(l.MetaFile.File,l.MetaFile.Root,l.MetaFile.Path,l.MetaFile.BaseN
> ame,l.MetaFile.OriginalPath,l.Arch,True) for l in
> Libs]))
>              if WithoutPcd and module_obj.PcdIsDriver:
>                  continue
> diff --git a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py 
> b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
> index ea0d8f8bfb..2494267472 100644
> --- a/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
> +++ b/BaseTools/Source/Python/AutoGen/WorkspaceAutoGen.py
> @@ -246,11 +246,13 @@ class WorkspaceAutoGen(AutoGen):
>                  if BuildData.MetaFile.Ext == '.inf' and str(BuildData) in Platform.Modules :
>                      Libs.extend(GetModuleLibInstances(BuildData, Platform,
>                                       self.BuildDatabase,
>                                       Arch,
>                                       self.BuildTarget,
> -                                     self.ToolChain
> +                                     self.ToolChain,
> +                                     self.Platform.MetaFile,
> +                                     EdkLogger
>                                       ))
>              for BuildData in list(self.BuildDatabase._CACHE_.values()):
>                  if BuildData.Arch != Arch:
>                      continue
>                  if BuildData.MetaFile.Ext == '.inf':
> diff --git a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py 
> b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
> index 76583f46e5..cbbd550dbd 100644
> --- a/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
> +++ b/BaseTools/Source/Python/Workspace/WorkspaceCommon.py
> @@ -13,10 +13,11 @@ from .BuildClassObject import LibraryClassObject  
> import Common.GlobalData as GlobalData  from 
> Workspace.BuildClassObject import StructurePcd  from 
> Common.BuildToolError import RESOURCE_NOT_AVAILABLE  from 
> Common.BuildToolError import OPTION_MISSING  from 
> Common.BuildToolError import BUILD_ERROR
> +import Common.EdkLogger as EdkLogger
> 
>  class OrderedListDict(OrderedDict):
>      def __init__(self, *args, **kwargs):
>          super(OrderedListDict, self).__init__(*args, **kwargs)
>          self.default_factory = list
> @@ -83,11 +84,11 @@ def GetDeclaredPcd(Platform, BuildDatabase, Arch, 
> Target, Toolchain, additionalP  #  @param Target: Current target  #  
> @param Toolchain: Current toolchain  #  @retval: List of dependent 
> libraries which are InfBuildData instances  #  def 
> GetLiabraryInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain):
> -    return GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain)
> +    return GetModuleLibInstances(Module, Platform, BuildDatabase, 
> + Arch, Target, Toolchain,Platform.MetaFile,EdkLogger)
> 
>  def GetModuleLibInstances(Module, Platform, BuildDatabase, Arch, Target, Toolchain, FileName = '', EdkLogger = None):
>      if Module.LibInstances:
>          return Module.LibInstances
>      ModuleType = Module.ModuleType
> --
> 2.20.1.windows.1


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

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

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.