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: bob.c.feng@intel.com) Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by groups.io with SMTP; Sun, 21 Apr 2019 19:34:53 -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 orsmga106.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Apr 2019 19:34:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,380,1549958400"; d="scan'208";a="133261384" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga007.jf.intel.com with ESMTP; 21 Apr 2019 19:29:51 -0700 Received: from fmsmsx124.amr.corp.intel.com (10.18.125.39) by FMSMSX106.amr.corp.intel.com (10.18.124.204) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 21 Apr 2019 19:29:40 -0700 Received: from shsmsx106.ccr.corp.intel.com (10.239.4.159) by fmsmsx124.amr.corp.intel.com (10.18.125.39) with Microsoft SMTP Server (TLS) id 14.3.408.0; Sun, 21 Apr 2019 19:28:35 -0700 Received: from shsmsx101.ccr.corp.intel.com ([169.254.1.164]) by SHSMSX106.ccr.corp.intel.com ([169.254.10.21]) with mapi id 14.03.0415.000; Mon, 22 Apr 2019 10:28:33 +0800 From: "Bob Feng" To: "devel@edk2.groups.io" , "Rodriguez, Christian" CC: "Gao, Liming" , "Zhu, Yonghong" Subject: Re: [edk2-devel] [PATCH] BaseTools: Hash false success.. minor change in hash invalidation Thread-Topic: [edk2-devel] [PATCH] BaseTools: Hash false success.. minor change in hash invalidation Thread-Index: AQHU9IxTtMIulWnbyk+qe8ejL6bcE6ZHfPGQ Date: Mon, 22 Apr 2019 02:28:33 +0000 Message-ID: <08650203BA1BD64D8AD9B6D5D74A85D1600E6277@SHSMSX101.ccr.corp.intel.com> References: <20190416194055.12096-1-christian.rodriguez@intel.com> In-Reply-To: <20190416194055.12096-1-christian.rodriguez@intel.com> 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: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Chri= stian Rodriguez Sent: Wednesday, April 17, 2019 3:41 AM To: devel@edk2.groups.io Cc: Feng, Bob C ; Gao, Liming = ; Zhu, Yonghong Subject: [edk2-devel] [PATCH] BaseTools: Hash false success.. minor change= in hash invalidation BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D1692 Change part of the hash error handling to invalidate hashes in the cache d= estination not the cache source. Signed-off-by: Christian Rodriguez Cc: Bob Feng Cc: Liming Gao Cc: Yonghong Zhu --- BaseTools/Source/Python/build/build.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/Pyt= hon/build/build.py index 71478b7268..7271570d29 100644 --- a/BaseTools/Source/Python/build/build.py +++ b/BaseTools/Source/Python/build/build.py @@ -1165,8 +1165,8 @@ class Build(): os.remove(ModuleHashFile) =20 # Remove .hash file from cache - if GlobalData.gBinCacheSource: - FileDir =3D path.join(GlobalData.gBinCacheSource, moduleA= utoGenObj.Arch, moduleAutoGenObj.SourceDir, moduleAutoGenObj.MetaFile.BaseN= ame) + if GlobalData.gBinCacheDest: + FileDir =3D path.join(GlobalData.gBinCacheDest,=20 + moduleAutoGenObj.Arch, moduleAutoGenObj.SourceDir,=20 + moduleAutoGenObj.MetaFile.BaseName) HashFile =3D path.join(FileDir, moduleAutoGenObj.Name + '= .hash') if os.path.exists(HashFile): os.remove(HashFile) -- 2.19.1.windows.1