X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FGenFds%2FDepexSection.py;h=8f78c0fad474fb38829160b94cd3331c4127dea1;hp=c048efe47801bd65667e8b254f8f411cd4ef8620;hb=97fa0ee9b1cffbb4b97ee35365afa7afcf50e174;hpb=1be2ed90a20618d71ddf34b8a07d038da0b36854

diff --git a/BaseTools/Source/Python/GenFds/DepexSection.py b/BaseTools/Source/Python/GenFds/DepexSection.py
index c048efe478..8f78c0fad4 100644
--- a/BaseTools/Source/Python/GenFds/DepexSection.py
+++ b/BaseTools/Source/Python/GenFds/DepexSection.py
@@ -24,6 +24,7 @@ from CommonDataClass.FdfClass import DepexSectionClassObject
 from AutoGen.GenDepex import DependencyExpression
 from Common import EdkLogger
 from Common.BuildToolError import *
+from Common.Misc import PathClass
 
 ## generate data section
 #
@@ -38,10 +39,22 @@ class DepexSection (DepexSectionClassObject):
 
     def __FindGuidValue(self, CName):
         for Arch in GenFdsGlobalVariable.ArchList:
-            for PkgDb in GenFdsGlobalVariable.WorkSpace.GetPackageList(GenFdsGlobalVariable.ActivePlatform, 
-                                                                       Arch, 
-                                                                       GenFdsGlobalVariable.TargetName, 
-                                                                       GenFdsGlobalVariable.ToolChainTag):
+            PkgList = GenFdsGlobalVariable.WorkSpace.GetPackageList(GenFdsGlobalVariable.ActivePlatform,
+                                                                    Arch,
+                                                                    GenFdsGlobalVariable.TargetName,
+                                                                    GenFdsGlobalVariable.ToolChainTag)
+            for Inf in GenFdsGlobalVariable.FdfParser.Profile.InfList:
+                ModuleFile = PathClass(Inf, GenFdsGlobalVariable.WorkSpaceDir)
+                ModuleData = GenFdsGlobalVariable.WorkSpace.BuildObject[
+                                                            ModuleFile,
+                                                            Arch,
+                                                            GenFdsGlobalVariable.TargetName,
+                                                            GenFdsGlobalVariable.ToolChainTag
+                                                            ]
+                for Pkg in ModuleData.Packages:
+                    if Pkg not in PkgList:
+                        PkgList.append(Pkg)
+            for PkgDb in PkgList:
                 if CName in PkgDb.Ppis:
                     return PkgDb.Ppis[CName]
                 if CName in PkgDb.Protocols: