tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BaseTools: Fix GenSec can't found the depex file 

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>
Reviewed-by: Liming Gao <liming.gao@intel.com>
This commit is contained in:
Yunhua Feng 2017-12-07 11:35:16 +08:00 committed by Yonghong Zhu
parent 5b8766bb92
commit cf245466a5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BaseTools/Source/Python/GenFds/EfiSection.py
View File

@ -92,9 +92,10 @@ class EfiSection (EfiSectionClassObject):
elif os.path.exists(Filename): elif os.path.exists(Filename):
FileList.append(Filename) FileList.append(Filename)
elif '.depex' in FfsInf.FinalTargetSuffixMap or FfsInf.Depex: elif '.depex' in FfsInf.FinalTargetSuffixMap or FfsInf.Depex:
if IsMakefile:
FileList.append(Filename) FileList.append(Filename)
else: 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 : if IsSect :
return FileList, self.Alignment return FileList, self.Alignment

4
BaseTools/Source/Python/GenFds/Section.py
View File

@ -110,7 +110,7 @@ class Section (SectionClassObject):
# @param Dict dictionary contains macro and its value # @param Dict dictionary contains macro and its value
# @retval tuple (File list, boolean) # @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() : if FileType in Section.SectFileType.keys() :
IsSect = True IsSect = True
else : else :
@ -141,7 +141,7 @@ class Section (SectionClassObject):
else: 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)) 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 # Get Makefile path and time stamp
# #