sravan/system76-edk2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

BaseTools: Fix the missing depex file in GenFds

Browse Source 
If FDF FfsRule describes |.depex for depex file on source build, it may
be missed in the generated FD image. GenFds tool needs to check the
output file list and find the matched one.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Liming Gao <liming.gao@intel.com>
Reviewed-by: Yingke Liu <yingke.d.liu@intel.com>

git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18318 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Liming Gao
2015-08-26 06:33:31 +00:00
committed by lgao4
parent 118bf0960c
commit 23cc8adbaf
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,7 +1,7 @@
## @file ## @file
# section base class # section base class
# #
# Copyright (c) 2007-2014, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2007-2015, Intel Corporation. All rights reserved.<BR>
# #
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -149,11 +149,7 @@ class Section (SectionClassObject):
Makefile = os.path.join(MakefileDir, 'Makefile') Makefile = os.path.join(MakefileDir, 'Makefile')
if not os.path.exists(Makefile): if not os.path.exists(Makefile):
Makefile = os.path.join(MakefileDir, 'GNUmakefile') Makefile = os.path.join(MakefileDir, 'GNUmakefile')
if not os.path.exists(Makefile): if os.path.exists(Makefile):
SuffixMap = FfsInf.GetFinalTargetSuffixMap()
if Suffix in SuffixMap:
FileList.extend(SuffixMap[Suffix])
else:
# Update to search files with suffix in all sub-dirs. # Update to search files with suffix in all sub-dirs.
Tuple = os.walk(FfsInf.EfiOutputPath) Tuple = os.walk(FfsInf.EfiOutputPath)
for Dirpath, Dirnames, Filenames in Tuple: for Dirpath, Dirnames, Filenames in Tuple:
@ -162,7 +158,11 @@ class Section (SectionClassObject):
FullName = os.path.join(Dirpath, F) FullName = os.path.join(Dirpath, F)
if os.path.getmtime(FullName) > os.path.getmtime(Makefile): if os.path.getmtime(FullName) > os.path.getmtime(Makefile):
FileList.append(FullName) FileList.append(FullName)
if not FileList:
SuffixMap = FfsInf.GetFinalTargetSuffixMap()
if Suffix in SuffixMap:
FileList.extend(SuffixMap[Suffix])
#Process the file lists is alphabetical for a same section type #Process the file lists is alphabetical for a same section type
if len (FileList) > 1: if len (FileList) > 1:
FileList.sort() FileList.sort()