From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242]) by mx.groups.io with SMTP id smtpd.web08.24516.1604280769416252809 for ; Sun, 01 Nov 2020 17:32:50 -0800 Authentication-Results: mx.groups.io; dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn) Received: from DESKTOPS6D0PVI ([58.246.60.130]) (envelope-sender ) by 192.168.6.13 with ESMTP for ; Mon, 02 Nov 2020 09:32:46 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: "'Bob Feng'" , Cc: "'Yuwei Chen'" References: <20201026122744.45096-1-bob.c.feng@intel.com> In-Reply-To: <20201026122744.45096-1-bob.c.feng@intel.com> Subject: =?UTF-8?B?5Zue5aSNOiBbUGF0Y2hdIEJhc2VUb29sczogUmVtb3ZlIHRoZSBkZXBlbmRlbmN5IG9uIHRoZSBidWlsZCBpbnRlcm1lZGlhdGUgZmlsZQ==?= Date: Mon, 2 Nov 2020 09:32:45 +0800 Message-ID: <004901d6b0b8$11161820$33424860$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQJvUmj7T0qHrxr5mlx0sEGf3xVq5qiCyoig Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Bob: So, this incremental issue happens when the source file name is = changed. Is it only for *.aslc file, or also for other file, such as *.asl? Thanks Liming > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: Bob Feng > =B7=A2=CB=CD=CA=B1=BC=E4: 2020=C4=EA10=D4=C226=C8=D5 20:28 > =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io > =B3=AD=CB=CD: Liming Gao ; Yuwei Chen > > =D6=F7=CC=E2: [Patch] BaseTools: Remove the dependency on the build = intermediate > file >=20 > When generating compressed section, the build tool rely on the > build intermediate files, which were generated in last build, to > get the file list. This method will cause the incremental build to > generate incorrect build result. To reproduce this incremental build > error, you can do: > 1. build Ovmf > 2. change the module OvmfPkg\AcpiTables a source file Facp.aslc > name from Facp.aslc to Facpxxx.aslc. > 3. change the Facp.aslc file name in [sources] section of = AcpiTables.inf > 4. incremental build Ovmf >=20 > you will see the in AcpiTables module Makefile, the corresponding > Facp.acpi file is not changed. >=20 > This patch is to make the build always get file list from the INF. >=20 > Signed-off-by: Bob Feng > Cc: Liming Gao > Cc: Yuwei Chen > --- > BaseTools/Source/Python/GenFds/Section.py | 15 --------------- > 1 file changed, 15 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/GenFds/Section.py > b/BaseTools/Source/Python/GenFds/Section.py > index 2acb70f412..0382b2a759 100644 > --- a/BaseTools/Source/Python/GenFds/Section.py > +++ b/BaseTools/Source/Python/GenFds/Section.py > @@ -139,25 +139,10 @@ class Section (SectionClassObject): > if File.Ext =3D=3D Suffix: > FileList.append(File.Path) >=20 > if (not IsMakefile and Suffix is not None and > os.path.exists(FfsInf.EfiOutputPath)) or (IsMakefile and Suffix is not None): > - # > - # Get Makefile path and time stamp > - # > - MakefileDir =3D FfsInf.EfiOutputPath[:-len('OUTPUT')] > - Makefile =3D os.path.join(MakefileDir, 'Makefile') > - if not os.path.exists(Makefile): > - Makefile =3D os.path.join(MakefileDir, 'GNUmakefile') > - if os.path.exists(Makefile): > - # Update to search files with suffix in all sub-dirs. > - Tuple =3D os.walk(FfsInf.EfiOutputPath) > - for Dirpath, Dirnames, Filenames in Tuple: > - for F in Filenames: > - if os.path.splitext(F)[1] =3D=3D Suffix: > - FullName =3D os.path.join(Dirpath, F) > - if os.path.getmtime(FullName) > > os.path.getmtime(Makefile): > - FileList.append(FullName) > if not FileList: > SuffixMap =3D FfsInf.GetFinalTargetSuffixMap() > if Suffix in SuffixMap: > FileList.extend(SuffixMap[Suffix]) >=20 > -- > 2.20.1.windows.1