BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=1806
Current Binary Cache use the PlatformInfo.Name to distinguish
the different platform cache paths in the database folder.
But the different platforms might use the same PLATFORM_NAME
in the DSC files. Different platform caches might overlay each
other inside Binary Cache database if they use same platform name
Use the PlatformInfo.Platform.OutputDirectory instead of the
PlatformInfo.Name can solve the problem.
This patch is going to fix that issue.
Cc: Liming Gao <liming....@intel.com>
Cc: Bob Feng <bob.c.f...@intel.com>
Cc: Steven Shi <steven....@intel.com>
Signed-off-by: Zhiju.Fan <zhijux....@intel.com>
---
BaseTools/Source/Python/AutoGen/AutoGen.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/BaseTools/Source/Python/AutoGen/AutoGen.py
b/BaseTools/Source/Python/AutoGen/AutoGen.py
index 31721a6f9f..6731d93659 100644
--- a/BaseTools/Source/Python/AutoGen/AutoGen.py
+++ b/BaseTools/Source/Python/AutoGen/AutoGen.py
@@ -3897,7 +3897,7 @@ class ModuleAutoGen(AutoGen):
self.CopyModuleToCache()
def CopyModuleToCache(self):
- FileDir = path.join(GlobalData.gBinCacheDest, self.PlatformInfo.Name,
self.BuildTarget + "_" + self.ToolChain, self.Arch, self.SourceDir,
self.MetaFile.BaseName)
+ FileDir = path.join(GlobalData.gBinCacheDest,
self.PlatformInfo.OutputDir, self.BuildTarget + "_" + self.ToolChain,
self.Arch, self.SourceDir, self.MetaFile.BaseName)
CreateDirectory (FileDir)
HashFile = path.join(self.BuildDir, self.Name + '.hash')
if os.path.exists(HashFile):
@@ -3929,7 +3929,7 @@ class ModuleAutoGen(AutoGen):
for f_ext in self.SourceFileList:
if '.inc' in str(f_ext):
return False
- FileDir = path.join(GlobalData.gBinCacheSource,
self.PlatformInfo.Name, self.BuildTarget + "_" + self.ToolChain, self.Arch,
self.SourceDir, self.MetaFile.BaseName)
+ FileDir = path.join(GlobalData.gBinCacheSource,
self.PlatformInfo.OutputDir, self.BuildTarget + "_" + self.ToolChain,
self.Arch, self.SourceDir, self.MetaFile.BaseName)
HashFile = path.join(FileDir, self.Name + '.hash')
if os.path.exists(HashFile):
f = open(HashFile, 'r')
--
2.14.1.windows.1
-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#41301): https://edk2.groups.io/g/devel/message/41301
Mute This Topic: https://groups.io/mt/31741712/21656
Group Owner: devel+ow...@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com]
-=-=-=-=-=-=-=-=-=-=-=-
<<attachment: winmail.dat>>
