From: Leif Lindholm <leif.lindholm@linaro.org>
To: Yonghong Zhu <yonghong.zhu@intel.com>
Cc: edk2-devel@lists.01.org, Yunhua Feng <yunhuax.feng@intel.com>,
Liming Gao <liming.gao@intel.com>
Subject: Re: [Patch V2] BaseTools: Fix GenSec can't found the depex file
Date: Thu, 7 Dec 2017 16:51:56 +0000 [thread overview]
Message-ID: <20171207165156.7doih2h3ob7dfhyt@bivouac.eciton.net> (raw)
In-Reply-To: <1512662384-11600-1-git-send-email-yonghong.zhu@intel.com>
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 <yunhuax.feng@intel.com>
>
> Filter the FileList when multiple genfds thread options is not enabled.
>
> Cc: Liming Gao <liming.gao@intel.com>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
> Signed-off-by: Yonghong Zhu <yonghong.zhu@intel.com>
Tested-by: Leif Lindholm <leif.lindholm@linaro.org>
> ---
> 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
next prev parent reply other threads:[~2017-12-07 16:47 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-12-07 15:59 [Patch V2] BaseTools: Fix GenSec can't found the depex file Yonghong Zhu
2017-12-07 16:51 ` Leif Lindholm [this message]
2017-12-08 0:47 ` Gao, Liming
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20171207165156.7doih2h3ob7dfhyt@bivouac.eciton.net \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox