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.115, mailfrom: liming.gao@intel.com) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by groups.io with SMTP; Wed, 28 Aug 2019 08:26:11 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga001.jf.intel.com ([10.7.209.18]) by fmsmga103.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 28 Aug 2019 08:26:10 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,441,1559545200"; d="scan'208";a="264679471" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga001.jf.intel.com with ESMTP; 28 Aug 2019 08:26:08 -0700 Received: from fmsmsx162.amr.corp.intel.com (10.18.125.71) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 28 Aug 2019 08:26:06 -0700 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx162.amr.corp.intel.com (10.18.125.71) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 28 Aug 2019 08:26:06 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.112]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.139]) with mapi id 14.03.0439.000; Wed, 28 Aug 2019 23:26:04 +0800 From: "Liming Gao" To: "Feng, Bob C" , "devel@edk2.groups.io" CC: "Shi, Steven" , "Kinney, Michael D" , "afish@apple.com" , "Laszlo Ersek (lersek@redhat.com)" , "leif.lindholm@linaro.org" Subject: Re: [Patch][edk2-stable201908] BaseTools: fix an incremental build issue. Thread-Topic: [Patch][edk2-stable201908] BaseTools: fix an incremental build issue. Thread-Index: AQHVXX37hYIB3vbmik+IrfWDksSXv6cQrdng Date: Wed, 28 Aug 2019 15:26:04 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E4DDB59@SHSMSX104.ccr.corp.intel.com> References: <20190828085209.25316-1-bob.c.feng@intel.com> In-Reply-To: <20190828085209.25316-1-bob.c.feng@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ctpclassification: CTP_NT x-titus-metadata-40: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiNGZiYTFkYjctYzQ0Mi00NjRhLTkzOTktZGU1YTA3MjMzNjI1IiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiU0YyNlZ2T2E2ZEl6V0RkdUJXbHJPNWx6dmhSRUZDbnBGOElsM0dFSmRtMk9sOHd6aCtMbTYxNXhUaEtqZXUrVCJ9 dlp-product: dlpe-windows dlp-version: 11.2.0.6 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Return-Path: liming.gao@intel.com Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Bob: This is the critical regression issue for the incremental build. I reques= t to catch it in this stable tag 201908.=20 This patch corrects the behavior. Reviewed-by: Liming Gao Thanks Liming > -----Original Message----- > From: Feng, Bob C > Sent: Wednesday, August 28, 2019 4:52 PM > To: devel@edk2.groups.io > Cc: Feng, Bob C ; Gao, Liming ; Shi, Steven > Subject: [Patch][edk2-stable201908] BaseTools: fix an incremental build i= ssue. >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2137 >=20 > This patch is going to fix a regression issue of incremental > build which was introduced by the commit 94459080c. > The changing on INF file will not trigger module rebuild. >=20 > Signed-off-by: Bob Feng > Cc: Liming Gao > Cc: Steven Shi > --- > BaseTools/Source/Python/AutoGen/ModuleAutoGen.py | 8 ++------ > 1 file changed, 2 insertions(+), 6 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py b/BaseTools= /Source/Python/AutoGen/ModuleAutoGen.py > index 2cd0d3859e..f610365f6d 100755 > --- a/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py > +++ b/BaseTools/Source/Python/AutoGen/ModuleAutoGen.py > @@ -1764,16 +1764,12 @@ class ModuleAutoGen(AutoGen): > for f in self.AutoGenDepSet: > FileSet.add (f.Path) >=20 > if os.path.exists (self.TimeStampPath): > os.remove (self.TimeStampPath) > - with tempfile.NamedTemporaryFile('w+', dir=3Dos.path.dirname= (self.TimeStampPath), delete=3DFalse) as tf: > - for f in FileSet: > - tf.write(f) > - tf.write("\n") > - tempname =3D tf.name > - SaveFileOnChange(self.TimeStampPath, tempname, False) > + > + SaveFileOnChange(self.TimeStampPath, "\n".join(FileSet), Fal= se) >=20 > # Ignore generating makefile when it is a binary module > if self.IsBinaryModule: > return >=20 > -- > 2.20.1.windows.1