]> git.proxmox.com Git - mirror_edk2.git/commitdiff
BaseTools: Fix GenFds increment build bug that missing cover command option's change
authorYunhua Feng <yunhuax.feng@intel.com>
Fri, 19 Jan 2018 03:21:15 +0000 (11:21 +0800)
committerYonghong Zhu <yonghong.zhu@intel.com>
Sun, 21 Jan 2018 08:27:55 +0000 (16:27 +0800)
Issue decription:
step 1, build platform X64
step 2, build platform IA32
step 3, build platform X64
step 4, check all ffs files for X64, the content still has IA32 in it

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Yunhua Feng <yunhuax.feng@intel.com>
Reviewed-by: Yonghong Zhu <yonghong.zhu@intel.com>
BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py

index 371d5a8217f70ffcf3cbe8175d79ac2cc8b7a1a4..97e20753ae9b540ec79e5158f4cea105095f8fa1 100644 (file)
@@ -1,7 +1,7 @@
 ## @file\r
 # Global variables for GenFds\r
 #\r
-#  Copyright (c) 2007 - 2017, Intel Corporation. All rights reserved.<BR>\r
+#  Copyright (c) 2007 - 2018, Intel Corporation. All rights reserved.<BR>\r
 #\r
 #  This program and the accompanying materials\r
 #  are licensed and made available under the terms and conditions of the BSD License\r
@@ -500,7 +500,7 @@ class GenFdsGlobalVariable:
             if IsMakefile:\r
                 if ' '.join(Cmd).strip() not in GenFdsGlobalVariable.SecCmdList:\r
                     GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())\r
-            elif GenFdsGlobalVariable.NeedsUpdate(Output, list(Input)):\r
+            elif GenFdsGlobalVariable.NeedsUpdate(Output, list(Input) + [CommandFile]):\r
                 GenFdsGlobalVariable.DebugLogger(EdkLogger.DEBUG_5, "%s needs update because of newer %s" % (Output, Input))\r
                 GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate section")\r
                 if (os.path.getsize(Output) >= GenFdsGlobalVariable.LARGE_FILE_SIZE and\r
@@ -552,7 +552,7 @@ class GenFdsGlobalVariable:
             GenFdsGlobalVariable.SecCmdList = []\r
             GenFdsGlobalVariable.CopyList = []\r
         else:\r
-            if not GenFdsGlobalVariable.NeedsUpdate(Output, list(Input)):\r
+            if not GenFdsGlobalVariable.NeedsUpdate(Output, list(Input) + [CommandFile]):\r
                 return\r
             GenFdsGlobalVariable.CallExternalTool(Cmd, "Failed to generate FFS")\r
 \r