Revision: 19377
http://sourceforge.net/p/edk2/code/19377
Author: vanjeff
Date: 2015-12-18 06:49:12 +0000 (Fri, 18 Dec 2015)
Log Message:
-----------
BaseTools: Fix a bug when apply patches to SEC use the FILE_GUID override
Fix a bug when applying patches to SEC modules that use the FILE_GUID
override. Since a temp dir is used when FILE_GUID override is used, the
INF file path comparisons fail. The fix is to capture the real INF file
path comparisons instead of using the temp dir path to the INF.
(Sync patch r19142 from main trunk.)
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Revision Links:
--------------
http://sourceforge.net/p/edk2/code/19142
Modified Paths:
--------------
branches/UDK2015/BaseTools/Source/Python/GenFds/FfsInfStatement.py
Modified: branches/UDK2015/BaseTools/Source/Python/GenFds/FfsInfStatement.py
===================================================================
--- branches/UDK2015/BaseTools/Source/Python/GenFds/FfsInfStatement.py
2015-12-18 06:48:32 UTC (rev 19376)
+++ branches/UDK2015/BaseTools/Source/Python/GenFds/FfsInfStatement.py
2015-12-18 06:49:12 UTC (rev 19377)
@@ -174,6 +174,10 @@
if ErrorCode != 0:
EdkLogger.error("GenFds", ErrorCode, ExtraData=ErrorInfo)
+ #
+ # Cache lower case version of INF path before processing FILE_GUID
override
+ #
+ InfLowerPath = str(PathClassObj).lower()
if self.OverrideGuid:
PathClassObj = ProcessDuplicatedInf(PathClassObj,
self.OverrideGuid, GenFdsGlobalVariable.WorkSpaceDir)
if self.CurrentArch != None:
@@ -241,7 +245,6 @@
continue
# Override Patchable PCD value by the value from DSC
PatchPcd = None
- InfLowerPath = str(PathClassObj).lower()
if InfLowerPath in DscModules and PcdKey in
DscModules[InfLowerPath].Pcds:
PatchPcd = DscModules[InfLowerPath].Pcds[PcdKey]
elif PcdKey in Platform.Pcds:
------------------------------------------------------------------------------
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
