X-Git-Url: https://git.proxmox.com/?a=blobdiff_plain;f=BaseTools%2FSource%2FPython%2FGenFds%2FGuidSection.py;h=0e5bb3b27072289c43c58e1de59fd0e4047ccaf4;hb=0acb3d286258f50aec7dea6f86f4567078705ffa;hp=36ad4f58ef8189f2cb13b2308179baea08b18138;hpb=25918452ed5e9d12ea56b3bb2193df9ab96666b1;p=mirror_edk2.git

diff --git a/BaseTools/Source/Python/GenFds/GuidSection.py b/BaseTools/Source/Python/GenFds/GuidSection.py
index 36ad4f58ef..0e5bb3b270 100644
--- a/BaseTools/Source/Python/GenFds/GuidSection.py
+++ b/BaseTools/Source/Python/GenFds/GuidSection.py
@@ -1,7 +1,7 @@
 ## @file
 # process GUIDed section generation
 #
-#  Copyright (c) 2007 - 2010, Intel Corporation. All rights reserved.<BR>
+#  Copyright (c) 2007 - 2014, Intel Corporation. All rights reserved.<BR>
 #
 #  This program and the accompanying materials
 #  are licensed and made available under the terms and conditions of the BSD License
@@ -18,7 +18,7 @@
 import Section
 import subprocess
 from Ffs import Ffs
-import os
+import Common.LongFilePathOs as os
 from GenFdsGlobalVariable import GenFdsGlobalVariable
 from CommonDataClass.FdfClass import GuidSectionClassObject
 from Common import ToolDefClassObject
@@ -26,6 +26,7 @@ import sys
 from Common import EdkLogger
 from Common.BuildToolError import *
 from FvImageSection import FvImageSection
+from Common.LongFilePathSupport import OpenLongFilePath as open
 
 ## generate GUIDed section
 #
@@ -197,7 +198,7 @@ class GuidSection(GuidSectionClassObject) :
                 HeaderLength = str(self.ExtraHeaderSize)
 
             if self.ProcessRequired == "NONE" and HeaderLength == None:
-                if TempFileSize > InputFileSize and TempFileSize % 4 == 0:
+                if TempFileSize > InputFileSize:
                     FileHandleIn.seek(0)
                     BufferIn  = FileHandleIn.read()
                     FileHandleOut.seek(0)
@@ -246,15 +247,15 @@ class GuidSection(GuidSectionClassObject) :
         if self.KeyStringList == None or self.KeyStringList == []:
             Target = GenFdsGlobalVariable.TargetName
             ToolChain = GenFdsGlobalVariable.ToolChainTag
-            ToolDb = ToolDefClassObject.ToolDefDict(GenFdsGlobalVariable.WorkSpaceDir).ToolsDefTxtDatabase
+            ToolDb = ToolDefClassObject.ToolDefDict(GenFdsGlobalVariable.ConfDir).ToolsDefTxtDatabase
             if ToolChain not in ToolDb['TOOL_CHAIN_TAG']:
                 EdkLogger.error("GenFds", GENFDS_ERROR, "Can not find external tool because tool tag %s is not defined in tools_def.txt!" % ToolChain)
             self.KeyStringList = [Target+'_'+ToolChain+'_'+self.CurrentArchList[0]]
             for Arch in self.CurrentArchList:
-                if Target+'_'+ToolChain+'_'+Arch not in self.KeyStringList:
-                    self.KeyStringList.append(Target+'_'+ToolChain+'_'+Arch)
-                    
-        ToolDefinition = ToolDefClassObject.ToolDefDict(GenFdsGlobalVariable.WorkSpaceDir).ToolsDefTxtDictionary
+                if Target + '_' + ToolChain + '_' + Arch not in self.KeyStringList:
+                    self.KeyStringList.append(Target + '_' + ToolChain + '_' + Arch)
+
+        ToolDefinition = ToolDefClassObject.ToolDefDict(GenFdsGlobalVariable.ConfDir).ToolsDefTxtDictionary
         ToolPathTmp = None
         for ToolDef in ToolDefinition.items():
             if self.NameGuid == ToolDef[1]: