From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received-SPF: Pass (sender SPF authorized) identity=mailfrom; client-ip=2a00:1450:400c:c09::241; helo=mail-wm0-x241.google.com; envelope-from=leif.lindholm@linaro.org; receiver=edk2-devel@lists.01.org Received: from mail-wm0-x241.google.com (mail-wm0-x241.google.com [IPv6:2a00:1450:400c:c09::241]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 1B7DC221EA0A3 for ; Thu, 7 Dec 2017 08:47:27 -0800 (PST) Received: by mail-wm0-x241.google.com with SMTP id t8so14183017wmc.3 for ; Thu, 07 Dec 2017 08:52:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=fmlLxVSVJtGWIwR8SFmGCDF4Oz8VPsYc8GQ4+2qfGWM=; b=RCaRUuiDlhnpQ+ZzwzCe+5H+JsEf22o9tXXQWjjiIBpWStkDCsz0HIrTvtcLmnDe65 KhYdRW5FLa/kaOIs8k1pYWwIo9ezNITmpvd8uqkUeX1MsgMmYIldj/E40TQyj8SYwQ/V Wf7nx6+VycseVBruYVfOqafO1EyyV60ekOqRw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=fmlLxVSVJtGWIwR8SFmGCDF4Oz8VPsYc8GQ4+2qfGWM=; b=fRtQOXpgza97J78s4IrDve+CeQxdm8nVSLAlJdJ1baNZNAKbqSAEMHaMQ+A9QHJ5dO n4KrfRkwr7eFvIHe+wRx9mFgc8Qpc8+LwZNRXgVpKum1x7VYYXD2Kwm19f14/Ifz1ttS xVuzycpnIR0ky5sjZzwc2JvxDPPnXEyQO03L6SAni//jsseCSfbxvNMN1V55ChiFGjtZ BJThA74/IDPbXGfb9YbsGOtYCB7BALvqfNi6RyW62WUeIYdYaCa+6xhfKykN35eK8thY Qaez3Fs/N9oHTTvSnvDOibQXzrtQEQM40hEIOfNV3Pz4pixdyqaDVzVl9s7jCNQax6VJ vTCA== X-Gm-Message-State: AKGB3mLMPYlGiCCv8cgEFMi8zLAmczdRnOmgR1QSOUeAx4O95Wbll3Pj MCoegtC4aoy3KwYgerXnMID8sQ== X-Google-Smtp-Source: AGs4zMZqYolBlKkoe0dtHGfr5v2QPwmzCV/uMlcOcC5u6YNomb5ZEL6FOLD4qbc8FbD1otF2NStGcA== X-Received: by 10.28.221.138 with SMTP id u132mr1641100wmg.113.1512665518914; Thu, 07 Dec 2017 08:51:58 -0800 (PST) Received: from bivouac.eciton.net (bivouac.eciton.net. [2a00:1098:0:86:1000:23:0:2]) by smtp.gmail.com with ESMTPSA id v18sm6380054wrv.37.2017.12.07.08.51.57 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 07 Dec 2017 08:51:57 -0800 (PST) Date: Thu, 7 Dec 2017 16:51:56 +0000 From: Leif Lindholm To: Yonghong Zhu Cc: edk2-devel@lists.01.org, Yunhua Feng , Liming Gao Message-ID: <20171207165156.7doih2h3ob7dfhyt@bivouac.eciton.net> References: <1512662384-11600-1-git-send-email-yonghong.zhu@intel.com> MIME-Version: 1.0 In-Reply-To: <1512662384-11600-1-git-send-email-yonghong.zhu@intel.com> User-Agent: NeoMutt/20170113 (1.7.2) 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: Thu, 07 Dec 2017 16:47:27 -0000 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Thanks - with this patch all of my platforms build again. On Thu, Dec 07, 2017 at 11:59:44PM +0800, Yonghong Zhu wrote: > From: Yunhua Feng > > Filter the FileList when multiple genfds thread options is not enabled. > > Cc: Liming Gao > Contributed-under: TianoCore Contribution Agreement 1.1 > Signed-off-by: Yunhua Feng > Signed-off-by: Yonghong Zhu Tested-by: Leif Lindholm > --- > BaseTools/Source/Python/GenFds/EfiSection.py | 5 +++-- > BaseTools/Source/Python/GenFds/Section.py | 4 ++-- > 2 files changed, 5 insertions(+), 4 deletions(-) > > diff --git a/BaseTools/Source/Python/GenFds/EfiSection.py b/BaseTools/Source/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 = Section.Section.GetFileList(FfsInf, self.FileType, self.FileExtension, Dict) > + FileList, IsSect = Section.Section.GetFileList(FfsInf, self.FileType, self.FileExtension, Dict, IsMakefile=IsMakefile) > if IsSect : > return FileList, self.Alignment > > Index = 0 > Align = 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 = {}): > + def GetFileList(FfsInf, FileType, FileExtension, Dict = {}, IsMakefile=False): > if FileType in Section.SectFileType.keys() : > IsSect = True > else : > IsSect = False > > @@ -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, FfsInf.InfFileName)) > > - if Suffix != None: > + if (not IsMakefile and Suffix != None and os.path.exists(FfsInf.EfiOutputPath)) or (IsMakefile and Suffix != None): > # > # Get Makefile path and time stamp > # > MakefileDir = FfsInf.EfiOutputPath[:-len('OUTPUT')] > Makefile = os.path.join(MakefileDir, 'Makefile') > -- > 2.6.1.windows.1 > > _______________________________________________ > edk2-devel mailing list > edk2-devel@lists.01.org > https://lists.01.org/mailman/listinfo/edk2-devel