Revision: 19142
http://sourceforge.net/p/edk2/code/19142
Author: yzhu52
Date: 2015-12-07 09:08:05 +0000 (Mon, 07 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.
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Yonghong Zhu <[email protected]>
Reviewed-by: Liming Gao <[email protected]>
Modified Paths:
--------------
trunk/edk2/BaseTools/Source/Python/GenFds/FfsInfStatement.py
Modified: trunk/edk2/BaseTools/Source/Python/GenFds/FfsInfStatement.py
===================================================================
--- trunk/edk2/BaseTools/Source/Python/GenFds/FfsInfStatement.py
2015-12-07 09:04:39 UTC (rev 19141)
+++ trunk/edk2/BaseTools/Source/Python/GenFds/FfsInfStatement.py
2015-12-07 09:08:05 UTC (rev 19142)
@@ -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:
------------------------------------------------------------------------------
Go from Idea to Many App Stores Faster with Intel(R) XDK
Give your users amazing mobile app experiences with Intel(R) XDK.
Use one codebase in this all-in-one HTML5 development environment.
Design, debug & build mobile apps & 2D/3D high-impact games for multiple OSs.
http://pubads.g.doubleclick.net/gampad/clk?id=254741911&iu=/4140
_______________________________________________
edk2-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/edk2-commits
