From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 192.55.52.151, mailfrom: bob.c.feng@intel.com) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by groups.io with SMTP; Thu, 23 May 2019 22:32:03 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga007.jf.intel.com ([10.7.209.58]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 May 2019 22:32:02 -0700 X-ExtLoop1: 1 Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga007.jf.intel.com with ESMTP; 23 May 2019 22:32:02 -0700 Received: from fmsmsx120.amr.corp.intel.com (10.18.124.208) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 23 May 2019 22:32:02 -0700 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by fmsmsx120.amr.corp.intel.com (10.18.124.208) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 23 May 2019 22:32:01 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.129]) by SHSMSX154.ccr.corp.intel.com ([169.254.7.136]) with mapi id 14.03.0415.000; Fri, 24 May 2019 13:31:59 +0800 From: "Bob Feng" To: "Fan, ZhijuX" , "devel@edk2.groups.io" CC: "Gao, Liming" , "Shi, Steven" Subject: Re: [PATCH] BaseTools:Change the path of the file that Binary Cache Thread-Topic: [PATCH] BaseTools:Change the path of the file that Binary Cache Thread-Index: AdUR7duVAp7dDB4rSc+f1tzdqHcgYAABB2Eg Date: Fri, 24 May 2019 05:31:59 +0000 Message-ID: <08650203BA1BD64D8AD9B6D5D74A85D1601151E7@SHSMSX101.ccr.corp.intel.com> References: In-Reply-To: Accept-Language: zh-CN, en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: bob.c.feng@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Bob Feng -----Original Message----- From: Fan, ZhijuX=20 Sent: Friday, May 24, 2019 1:02 PM To: devel@edk2.groups.io Cc: Gao, Liming ; Feng, Bob C ;= Shi, Steven Subject: [PATCH] BaseTools:Change the path of the file that Binary Cache BZ:https://bugzilla.tianocore.org/show_bug.cgi?id=3D1806 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 fil= es. 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.N= ame can solve the problem. This patch is going to fix that issue. Cc: Liming Gao Cc: Bob Feng Cc: Steven Shi Signed-off-by: Zhiju.Fan --- 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() =20 def CopyModuleToCache(self): - FileDir =3D path.join(GlobalData.gBinCacheDest, self.PlatformInfo.= Name, self.BuildTarget + "_" + self.ToolChain, self.Arch, self.SourceDir, s= elf.MetaFile.BaseName) + FileDir =3D path.join(GlobalData.gBinCacheDest,=20 + self.PlatformInfo.OutputDir, self.BuildTarget + "_" + self.ToolChain,=20 + self.Arch, self.SourceDir, self.MetaFile.BaseName) CreateDirectory (FileDir) HashFile =3D 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 =3D path.join(GlobalData.gBinCacheSource, self.PlatformInf= o.Name, self.BuildTarget + "_" + self.ToolChain, self.Arch, self.SourceDir,= self.MetaFile.BaseName) + FileDir =3D path.join(GlobalData.gBinCacheSource,=20 + self.PlatformInfo.OutputDir, self.BuildTarget + "_" + self.ToolChain,=20 + self.Arch, self.SourceDir, self.MetaFile.BaseName) HashFile =3D path.join(FileDir, self.Name + '.hash') if os.path.exists(HashFile): f =3D open(HashFile, 'r') -- 2.14.1.windows.1