From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: mx.groups.io; dkim=missing; spf=pass (domain: intel.com, ip: 134.134.136.126, mailfrom: zhijux.fan@intel.com) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Thu, 23 May 2019 22:02:23 -0700 X-Amp-Result: UNSCANNABLE X-Amp-File-Uploaded: False Received: from fmsmga007.fm.intel.com ([10.253.24.52]) by orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 23 May 2019 22:02:22 -0700 X-ExtLoop1: 1 Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by fmsmga007.fm.intel.com with ESMTP; 23 May 2019 22:02:22 -0700 Received: from fmsmsx126.amr.corp.intel.com (10.18.125.43) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 23 May 2019 22:02:22 -0700 Received: from shsmsx152.ccr.corp.intel.com (10.239.6.52) by FMSMSX126.amr.corp.intel.com (10.18.125.43) with Microsoft SMTP Server (TLS) id 14.3.408.0; Thu, 23 May 2019 22:02:22 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.129]) by SHSMSX152.ccr.corp.intel.com ([169.254.6.18]) with mapi id 14.03.0415.000; Fri, 24 May 2019 13:02:20 +0800 From: "Fan, ZhijuX" 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 Thread-Topic: [PATCH] BaseTools:Change the path of the file that Binary Cache Thread-Index: AdUR7duVAp7dDB4rSc+f1tzdqHcgYA== Date: Fri, 24 May 2019 05:02:18 +0000 Message-ID: Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.600.7 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: zhijux.fan@intel.com X-Groupsio-MsgNum: 41301 Content-Type: multipart/mixed; boundary="_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF62630SHSMSX101ccrcor_" Content-Language: en-US --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF62630SHSMSX101ccrcor_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable 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 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 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, self.PlatformInfo.= OutputDir, self.BuildTarget + "_" + self.ToolChain, self.Arch, self.SourceD= ir, 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, self.PlatformInf= o.OutputDir, self.BuildTarget + "_" + self.ToolChain, self.Arch, self.Sourc= eDir, self.MetaFile.BaseName) HashFile =3D path.join(FileDir, self.Name + '.hash') if os.path.exists(HashFile): f =3D open(HashFile, 'r') --=20 2.14.1.windows.1 --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF62630SHSMSX101ccrcor_ Content-Disposition: attachment; filename="winmail.dat" Content-Transfer-Encoding: base64 Content-Type: application/ms-tnef; name="winmail.dat" eJ8+IkY4AQaQCAAEAAAAAAABAAEAAQeQBgAIAAAA5AQAAAAAAADoAAEJgAEAIQAAADg2RTA1RDZE RDE2MDdCNDI4MEM4Qjk3NDM5ODI3MzY0AAMHAQ2ABAACAAAAAgACAAEFgAMADgAAAOMHBQAYAAUA AgASAAUAJQEBIIADAA4AAADjBwUAGAAFAAIAEgAFACUBAQiABwAYAAAASVBNLk1pY3Jvc29mdCBN YWlsLk5vdGUAMQgBBIABAEAAAABbUEFUQ0hdIEJhc2VUb29sczpDaGFuZ2UgdGhlIHBhdGggb2Yg dGhlIGZpbGUgdGhhdCBCaW5hcnkgQ2FjaGUA4hUBC4ABACEAAAA4NkUwNUQ2REQxNjA3QjQyODBD OEI5NzQzOTgyNzM2NAADBwEDkAYACA8AADMAAAACAX8AAQAAAEgAAAA8RkFEMEQ3RTBBRTBGQTU0 RDk4N0Y2RTcyNDM1Q0FGRDUwQUY2MjYzMEBTSFNNU1gxMDEuY2NyLmNvcnAuaW50ZWwuY29tPgAL AB8OAQAAAAIBCRABAAAAVwUAAFMFAABiCwAATFpGdZITTCJhAApmYmlkBAAAY2PAcGcxMjUyAP4D Q/B0ZXh0AfcCpAPjAgAEY2gKwHNldDAg7wdtAoMAUBFNMgqABrQCgJZ9CoAIyDsJYjE5DsC/CcMW cgoyFnECgBViKgmwcwnwBJBhdAWyDlADYHOibwGAIEV4EcFuGDBdBlJ2BJAXtgIQcgDAdH0IUG4a MRAgBcAFoBtkZJogA1IgECIXslx2CJDkd2sLgGQ1HVME8AdADRdwMApxF/Jia21rBnMBkAAgIEJN X0LgRUdJTn0K/AHxC/ERH7BaOmgCQHBzOsAvL2J1Z3oDEAtgJC50BzBubwWhZS4BBbBnL3Nob3df QSJRLmNnaT8N0D1AMTgwNlxsC4Bl+wqBJRRDCHAJcAIwH7ALgFEKwHkgQwDQaBngdXcSABzAJwFQ C2AAMBrxSWJuAhAuTmEHgBzAb64gDeEi4BnAdQQAaCUF/ydyDeABIASQJiILUSfjG9C/JuMKsCdw BCALgCdjZBiArQGgYSdBAhBsBIEuJQw8QnUFQCovJ+MEIG1pFmch0CcncyiSUExBEFRGT1If0E5B TcZFJQUsVURTQxxwAxC9B5AuMzAvPyuEMEZvGjHbC2AmsGUm4SUFbydxBcD/C4AAkAEAJlwsxwaQ J2ImsL8nMjFDKwcmgAeAJQxVJ0/TKFEnti5PLrBwLrAz8L0JcGMYkSawN4EQIGEcYH8ZMDxCJQUn vyuBA6AZIGzbGjA8Q3ADYAJgZT3QJQx8VGgEACviEcAsQAQgZ+5vKUEowjOAeDxBGIBEQQZzClAt vUNjOiBM0wdwRKJHYSjgPCUQR0K0LmdHoEALgBAgbCRAlQNwPkZ5QkJgIEYJ8NVEwDwG4GIkQC40 IBnAu0iPRtNTECAaMAOgU0Ow10fAPxFMsS4jwGlLLxTAEzBwGFBkLRkwZi1iCnlHAFpDsGp1Lkbp A5E8elACeErQAHBN7zwKLVJgJQUfsC0RVG8RBvBzL1MIYWNlL0xQeTxQAiAvQS6wbyZHCfBUhi5w JrB8INA0ICsrUngxM3Mb0GEZo2QsIDI3chuBaeECIHMoKylXogEAHnDZWDQtKSUMLyIgUmAkYLkF QGEvUx9UL1U3Yltfn1xvVScyZwEARTAzMQHAADFhNmY5Zi4uBDY3YaBkOTM2NcY5VrAeoDY0NFH4 Wz/rXx9gLwpWACteD2UvZj8ICkBAWtAzODk33Cw3VfBrBWrBYwtgBBFaTQRwdR5waTUoaTUp7jpS lm5qEgBsYjAIUFWQ92yEZ/Am0yhZpgMwbgkBAb8mwG+fbzJt12QAbmVGM5FJPlEgPSvjLmpEkSjm RwkALQBsRCzRSEAmYfUm00QHkHRXoG8zQE93dfMuoAMQZFQKwBgwBUBncLgiXyJ6EW8zZ/JDEdD/ C4B3dQcQEcB3dWhUPlF3dfpNEhBhdLJ5UC0RKIJZpv9ncHRPdV92b3d/KFE993j/v3oPex98L30/ fk1uZ0MJcLcYgH/yPoUof8WKH0gtEH5of8KAO4R4iGgog2dwJ/YuEdAjwCeMrzlRGRBVgP+AchAw KRFYcI22bddqwxaA/jlrQ5S0a/9tD24cGuEccP5fEDEsQoe5f8JHIB9gl48nkfWQsAuAYyeZI3Ry 3iiY05d/bmcJcHQIcAOg/1BQaCA7JnQvgE+BXWhUgo//eI+E/4YPhx+IL4k/fu+g3/+h76L/gw+E H6Xfpu+n/6kP/6ofjQ+OHavVj9+Q75H/kw9/nY8ccKxBckCW0bdWV6AnDnK6V2PxJQUyLjE0/cEA LgPwHcAj4DPAAFAlGwMVQsMQAB8AQgABAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUAWAAAAB8A ZQABAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwBk AAEAAAAKAAAAUwBNAFQAUAAAAAAAAgFBAAEAAABkAAAAAAAAAIErH6S+oxAZnW4A3QEPVAIAAACA RgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAUwBNAFQAUAAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABp AG4AdABlAGwALgBjAG8AbQAAAB8AAl0BAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4A dABlAGwALgBjAG8AbQAAAAAAHwDlXwEAAAAyAAAAcwBpAHAAOgB6AGgAaQBqAHUAeAAuAGYAYQBu AEAAaQBuAHQAZQBsAC4AYwBvAG0AAAAAAB8AGgwBAAAAGAAAAEYAYQBuACwAIABaAGgAaQBqAHUA WAAAAB8AHwwBAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4AQABpAG4AdABlAGwALgBjAG8AbQAA AAAAHwAeDAEAAAAKAAAAUwBNAFQAUAAAAAAAAgEZDAEAAABkAAAAAAAAAIErH6S+oxAZnW4A3QEP VAIAAACARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAUwBNAFQAUAAAAHoAaABpAGoAdQB4AC4AZgBh AG4AQABpAG4AdABlAGwALgBjAG8AbQAAAB8AAV0BAAAAKgAAAHoAaABpAGoAdQB4AC4AZgBhAG4A QABpAG4AdABlAGwALgBjAG8AbQAAAAAAHwD4PwEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBY AAAAHwAjQAEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAA AAAfACJAAQAAAAoAAABTAE0AVABQAAAAAAACAfk/AQAAAGQAAAAAAAAAgSsfpL6jEBmdbgDdAQ9U AgAAAIBGAGEAbgAsACAAWgBoAGkAagB1AFgAAABTAE0AVABQAAAAegBoAGkAagB1AHgALgBmAGEA bgBAAGkAbgB0AGUAbAAuAGMAbwBtAAAAHwAJXQEAAAAqAAAAegBoAGkAagB1AHgALgBmAGEAbgBA AGkAbgB0AGUAbAAuAGMAbwBtAAAAAAALAEA6AQAAAB8AGgABAAAAEgAAAEkAUABNAC4ATgBvAHQA ZQAAAAAAAwDxPwkEAAALAEA6AQAAAAMA/T/kBAAAAgELMAEAAAAQAAAAhuBdbdFge0KAyLl0OYJz ZAMAFwABAAAAQAA5AACpZ9ztEdUBQAAIMJqK0dztEdUBHwAAgIYDAgAAAAAAwAAAAAAAAEYBAAAA HgAAAGEAYwBjAGUAcAB0AGwAYQBuAGcAdQBhAGcAZQAAAAAAAQAAAAwAAABlAG4ALQBVAFMAAAAf ADcAAQAAAIAAAABbAFAAQQBUAEMASABdACAAQgBhAHMAZQBUAG8AbwBsAHMAOgBDAGgAYQBuAGcA ZQAgAHQAaABlACAAcABhAHQAaAAgAG8AZgAgAHQAaABlACAAZgBpAGwAZQAgAHQAaABhAHQAIABC AGkAbgBhAHIAeQAgAEMAYQBjAGgAZQAAAB8APQABAAAAAgAAAAAAAAADADYAAAAAAAIBcQABAAAA FgAAAAHVEe3blQKe3QweK0nPn9bc3ah3IGAAAB8AcAABAAAAgAAAAFsAUABBAFQAQwBIAF0AIABC AGEAcwBlAFQAbwBvAGwAcwA6AEMAaABhAG4AZwBlACAAdABoAGUAIABwAGEAdABoACAAbwBmACAA dABoAGUAIABmAGkAbABlACAAdABoAGEAdAAgAEIAaQBuAGEAcgB5ACAAQwBhAGMAaABlAAAAHwA1 EAEAAACQAAAAPABGAEEARAAwAEQANwBFADAAQQBFADAARgBBADUANABEADkAOAA3AEYANgBFADcA MgA0ADMANQBDAEEARgBEADUAMABBAEYANgAyADYAMwAwAEAAUwBIAFMATQBTAFgAMQAwADEALgBj AGMAcgAuAGMAbwByAHAALgBpAG4AdABlAGwALgBjAG8AbQA+AAAAAwDeP59OAABAAAcwNynP3O0R 1QECAQsAAQAAABAAAACG4F1t0WB7QoDIuXQ5gnNkAwAmAAAAAAACAUcAAQAAADMAAABjPVVTO2E9 TUNJO3A9SW50ZWw7bD1TSFNNU1gxMDEtMTkwNTI0MDUwMjE4Wi0yMjU5MgAAAgEQMAEAAABGAAAA AAAAACZ3vTk77DhJpKYVPcule0IHAPrQ1+CuD6VNmH9uckNcr9UAAABEEV4AAKaTaDaIdmxLp0rT 60eaTGQAAAlUj4YAAAAAHwD6PwEAAAAYAAAARgBhAG4ALAAgAFoAaABpAGoAdQBYAAAAAwAJWQEA AABAAACACCAGAAAAAADAAAAAAAAARgAAAAC/hQAAQMCY2+0R1QELAACACCAGAAAAAADAAAAAAAAA RgAAAACChQAAAAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAABgAAABkAGwAcAAtAHAAcgBvAGQA dQBjAHQAAAABAAAAGgAAAGQAbABwAGUALQB3AGkAbgBkAG8AdwBzAAAAAAAfAACAhgMCAAAAAADA AAAAAAAARgEAAAAYAAAAZABsAHAALQB2AGUAcgBzAGkAbwBuAAAAAQAAABYAAAAxADEALgAwAC4A NgAwADAALgA3AAAAAAAfAACAhgMCAAAAAADAAAAAAAAARgEAAAAaAAAAZABsAHAALQByAGUAYQBj AHQAaQBvAG4AAAAAAAEAAAAUAAAAbgBvAC0AYQBjAHQAaQBvAG4AAAADAA00/T8AAB8AAICGAwIA AAAAAMAAAAAAAABGAQAAACAAAAB4AC0AbQBzAC0AaABhAHMALQBhAHQAdABhAGMAaAAAAAEAAAAC AAAAAAAAAB8AAICGAwIAAAAAAMAAAAAAAABGAQAAACIAAAB4AC0AbwByAGkAZwBpAG4AYQB0AGkA bgBnAC0AaQBwAAAAAAABAAAAIAAAAFsAMQAwAC4AMgAzADkALgAxADIANwAuADQAMABdAAAAImE= --_000_FAD0D7E0AE0FA54D987F6E72435CAFD50AF62630SHSMSX101ccrcor_--