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

BaseTools: make build report tolerant of FVs specified by name 

Check if the FV name is in the FV dictionary before using it which fixes 
a crash during build report generation when FVs are specified by path in 
the FDF.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Eugene Cohen <eugene@hp.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>


git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@19705 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Eugene Cohen 2016-01-21 09:10:55 +00:00 committed by yzhu52
parent 61f816bd75
commit a243297253
1 changed files with 38 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
BaseTools/Source/Python/build/BuildReport.py
View File

@ -4,7 +4,7 @@
# This module contains the functionality to generate build report after # This module contains the functionality to generate build report after
# build all target completes successfully. # build all target completes successfully.
# #
# Copyright (c) 2010 - 2014, Intel Corporation. All rights reserved.<BR> # Copyright (c) 2010 - 2016, 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
# which accompanies this distribution. The full text of the license may be found at # which accompanies this distribution. The full text of the license may be found at
@ -1175,6 +1175,8 @@ class FdRegionReport(object):
# @param Wa Workspace context information # @param Wa Workspace context information
# #
def _DiscoverNestedFvList(self, FvName, Wa): def _DiscoverNestedFvList(self, FvName, Wa):
FvDictKey=FvName.upper()
if FvDictKey in Wa.FdfProfile.FvDict:
for Ffs in Wa.FdfProfile.FvDict[FvName.upper()].FfsList: for Ffs in Wa.FdfProfile.FvDict[FvName.upper()].FfsList:
for Section in Ffs.SectionList: for Section in Ffs.SectionList:
try: try:
@ -1264,6 +1266,8 @@ class FdRegionReport(object):
# Collect the GUID map in the FV firmware volume # Collect the GUID map in the FV firmware volume
# #
for FvName in self.FvList: for FvName in self.FvList:
FvDictKey=FvName.upper()
if FvDictKey in Wa.FdfProfile.FvDict:
for Ffs in Wa.FdfProfile.FvDict[FvName.upper()].FfsList: for Ffs in Wa.FdfProfile.FvDict[FvName.upper()].FfsList:
try: try:
# #