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.43, mailfrom: liming.gao@intel.com) Received: from mga05.intel.com (mga05.intel.com [192.55.52.43]) by groups.io with SMTP; Wed, 21 Aug 2019 06:34:39 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga004.jf.intel.com ([10.7.209.38]) by fmsmga105.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 21 Aug 2019 06:34:38 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.64,412,1559545200"; d="scan'208";a="330022620" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by orsmga004.jf.intel.com with ESMTP; 21 Aug 2019 06:34:38 -0700 Received: from shsmsx154.ccr.corp.intel.com (10.239.6.54) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Wed, 21 Aug 2019 06:34:37 -0700 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.112]) by SHSMSX154.ccr.corp.intel.com ([169.254.7.249]) with mapi id 14.03.0439.000; Wed, 21 Aug 2019 21:34:36 +0800 From: "Liming Gao" To: "devel@edk2.groups.io" , "Feng, Bob C" Subject: Re: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue Thread-Topic: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Fix incremental build genmake issue Thread-Index: AQHVWAblI+S5CDEF20O1eyEImpgobqcFmkEg Date: Wed, 21 Aug 2019 13:34:35 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E4D94FD@SHSMSX104.ccr.corp.intel.com> References: <20190821095727.6456-1-bob.c.feng@intel.com> In-Reply-To: <20190821095727.6456-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: eyJDYXRlZ29yeUxhYmVscyI6IiIsIk1ldGFkYXRhIjp7Im5zIjoiaHR0cDpcL1wvd3d3LnRpdHVzLmNvbVwvbnNcL0ludGVsMyIsImlkIjoiMjkyZGJjMGEtNzUxMS00MzFiLTliZmUtNmQ1NmQ2OWM4MThhIiwicHJvcHMiOlt7Im4iOiJDVFBDbGFzc2lmaWNhdGlvbiIsInZhbHMiOlt7InZhbHVlIjoiQ1RQX05UIn1dfV19LCJTdWJqZWN0TGFiZWxzIjpbXSwiVE1DVmVyc2lvbiI6IjE3LjEwLjE4MDQuNDkiLCJUcnVzdGVkTGFiZWxIYXNoIjoiVTJ5S2tYeWNMZ204K2JvY05mUDAraU4zNFZnUkl1cytqOFVTa0dndmg1Q3YxYzlDVGhJZG0xemtteUZ2NGJQZSJ9 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 Reviewed-by: Liming Gao > -----Original Message----- > From: devel@edk2.groups.io [mailto:devel@edk2.groups.io] On Behalf Of Bo= b Feng > Sent: Wednesday, August 21, 2019 5:57 PM > To: devel@edk2.groups.io > Cc: Gao, Liming ; Feng, Bob C > Subject: [edk2-devel] [Patch][edk2-stable201908] BaseTools: Fix incremen= tal build genmake issue >=20 > BZ: https://bugzilla.tianocore.org/show_bug.cgi?id=3D2090 >=20 > This is a regression issue introduced by commit e8449e. > This patch is going to fix this issue. >=20 > Cc: Liming Gao > Signed-off-by: Bob Feng > --- > BaseTools/Source/Python/build/build.py | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) >=20 > diff --git a/BaseTools/Source/Python/build/build.py b/BaseTools/Source/P= ython/build/build.py > index 2c10670a69..0406ac314b 100755 > --- a/BaseTools/Source/Python/build/build.py > +++ b/BaseTools/Source/Python/build/build.py > @@ -1217,11 +1217,10 @@ class Build(): > # for target which must generate AutoGen code and makefile > mqueue =3D mp.Queue() > for m in AutoGenObject.GetAllModuleInfo: > mqueue.put(m) >=20 > - AutoGenObject.DataPipe.DataContainer =3D {"FfsCommand":FfsC= ommand} > AutoGenObject.DataPipe.DataContainer =3D {"CommandTarget": = self.Target} > self.Progress.Start("Generating makefile and code") > data_pipe_file =3D os.path.join(AutoGenObject.BuildDir, "Gl= obalVar_%s_%s.bin" % > (str(AutoGenObject.Guid),AutoGenObject.Arch)) > AutoGenObject.DataPipe.dump(data_pipe_file) > autogen_rt,errorcode =3D self.StartAutoGen(mqueue, AutoGenO= bject.DataPipe, self.SkipAutoGen, PcdMaList, > GlobalData.gCacheIR) > @@ -1736,10 +1735,12 @@ class Build(): > if Ma.PcdIsDriver: > Ma.PlatformInfo =3D Pa > Ma.Workspace =3D Wa > PcdMaList.append(Ma) > self.BuildModules.append(Ma) > + Pa.DataPipe.DataContainer =3D {"FfsCommand":CmdList= Dict} > + Pa.DataPipe.DataContainer =3D {"Workspace_timestamp= ": Wa._SrcTimeStamp} > self._BuildPa(self.Target, Pa, FfsCommand=3DCmdList= Dict,PcdMaList=3DPcdMaList) >=20 > # Create MAP file when Load Fix Address is enabled. > if self.Target in ["", "all", "fds"]: > for Arch in Wa.ArchList: > -- > 2.20.1.windows.1 >=20 >=20 >=20