From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Permerror (SPF Permanent Error: More than 10 MX records returned) identity=mailfrom; client-ip=192.55.52.136; helo=mga12.intel.com; envelope-from=liming.gao@intel.com; receiver=edk2-devel@lists.01.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 21997221EA0DE for ; Thu, 7 Dec 2017 16:42:45 -0800 (PST) Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga106.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 07 Dec 2017 16:47:18 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.45,375,1508828400"; d="scan'208";a="10518893" Received: from fmsmsx106.amr.corp.intel.com ([10.18.124.204]) by orsmga003.jf.intel.com with ESMTP; 07 Dec 2017 16:47:18 -0800 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.319.2; Thu, 7 Dec 2017 16:47:17 -0800 Received: from shsmsx103.ccr.corp.intel.com (10.239.4.69) by fmsmsx124.amr.corp.intel.com (10.18.125.39) with Microsoft SMTP Server (TLS) id 14.3.319.2; Thu, 7 Dec 2017 16:47:17 -0800 Received: from shsmsx104.ccr.corp.intel.com ([169.254.5.152]) by SHSMSX103.ccr.corp.intel.com ([169.254.4.213]) with mapi id 14.03.0319.002; Fri, 8 Dec 2017 08:47:15 +0800 From: "Gao, Liming" To: "Zhu, Yonghong" , "edk2-devel@lists.01.org" CC: "Feng, YunhuaX" Thread-Topic: [Patch V2] BaseTools: Fix GenSec can't found the depex file Thread-Index: AQHTb3R2yLtHAiC3eUGSt13Cg7bdyqM4nT6g Date: Fri, 8 Dec 2017 00:47:15 +0000 Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E18C487@SHSMSX104.ccr.corp.intel.com> References: <1512662384-11600-1-git-send-email-yonghong.zhu@intel.com> In-Reply-To: <1512662384-11600-1-git-send-email-yonghong.zhu@intel.com> Accept-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-version: 11.0.0.116 dlp-reaction: no-action x-originating-ip: [10.239.127.40] MIME-Version: 1.0 Subject: Re: [Patch V2] BaseTools: Fix GenSec can't found the depex file X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 08 Dec 2017 00:42:45 -0000 Content-Language: en-US Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Reviewed-by: Liming Gao > -----Original Message----- > From: Zhu, Yonghong > Sent: Friday, December 8, 2017 12:00 AM > To: edk2-devel@lists.01.org > Cc: Feng, YunhuaX ; Gao, Liming > Subject: [Patch V2] BaseTools: Fix GenSec can't found the depex file >=20 > From: Yunhua Feng >=20 > Filter the FileList when multiple genfds thread options is not enabled. >=20 > Cc: Liming Gao > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Yunhua Feng > Signed-off-by: Yonghong Zhu > --- > BaseTools/Source/Python/GenFds/EfiSection.py | 5 +++-- > BaseTools/Source/Python/GenFds/Section.py | 4 ++-- > 2 files changed, 5 insertions(+), 4 deletions(-) >=20 > diff --git a/BaseTools/Source/Python/GenFds/EfiSection.py b/BaseTools/Sou= rce/Python/GenFds/EfiSection.py > index 7b3b717..5029ec7 100644 > --- a/BaseTools/Source/Python/GenFds/EfiSection.py > +++ b/BaseTools/Source/Python/GenFds/EfiSection.py > @@ -90,13 +90,14 @@ class EfiSection (EfiSectionClassObject): > if not self.Optional: > FileList.append(Filename) > elif os.path.exists(Filename): > FileList.append(Filename) > elif '.depex' in FfsInf.FinalTargetSuffixMap or FfsInf.Depex= : > - FileList.append(Filename) > + if IsMakefile: > + FileList.append(Filename) > else: > - FileList, IsSect =3D Section.Section.GetFileList(FfsInf, sel= f.FileType, self.FileExtension, Dict) > + FileList, IsSect =3D Section.Section.GetFileList(FfsInf, sel= f.FileType, self.FileExtension, Dict, IsMakefile=3DIsMakefile) > if IsSect : > return FileList, self.Alignment >=20 > Index =3D 0 > Align =3D self.Alignment > diff --git a/BaseTools/Source/Python/GenFds/Section.py b/BaseTools/Source= /Python/GenFds/Section.py > index 4c1aaac..463faa3 100644 > --- a/BaseTools/Source/Python/GenFds/Section.py > +++ b/BaseTools/Source/Python/GenFds/Section.py > @@ -108,11 +108,11 @@ class Section (SectionClassObject): > # @param FileType File type to get > # @param FileExtension File extension to get > # @param Dict dictionary contains macro and its value > # @retval tuple (File list, boolean) > # > - def GetFileList(FfsInf, FileType, FileExtension, Dict =3D {}): > + def GetFileList(FfsInf, FileType, FileExtension, Dict =3D {}, IsMake= file=3DFalse): > if FileType in Section.SectFileType.keys() : > IsSect =3D True > else : > IsSect =3D False >=20 > @@ -139,11 +139,11 @@ class Section (SectionClassObject): > else: > GenFdsGlobalVariable.VerboseLogger ("\nFile Type= \'%s\' of File %s in %s is not same with file type \'%s\' > from Rule in FDF" %(File.Type, File.File, FfsInf.InfFileName, FileType)) > else: > GenFdsGlobalVariable.InfLogger ("\nCurrent ARCH \'%s= \' of File %s is not in the Support Arch Scope of %s > specified by INF %s in FDF" %(FfsInf.CurrentArch, File.File, File.Arch, F= fsInf.InfFileName)) >=20 > - if Suffix !=3D None: > + if (not IsMakefile and Suffix !=3D None and os.path.exists(FfsIn= f.EfiOutputPath)) or (IsMakefile and Suffix !=3D None): > # > # Get Makefile path and time stamp > # > MakefileDir =3D FfsInf.EfiOutputPath[:-len('OUTPUT')] > Makefile =3D os.path.join(MakefileDir, 'Makefile') > -- > 2.6.1.windows.1