Compare commits
3 Commits
master
...
intel-fsp-
Author | SHA1 | Date | |
---|---|---|---|
|
8674aecb6a | ||
|
563bd1f035 | ||
|
2415686bbc |
@@ -152,7 +152,7 @@ class Ucs2Codec(codecs.Codec):
|
|||||||
|
|
||||||
TheUcs2Codec = Ucs2Codec()
|
TheUcs2Codec = Ucs2Codec()
|
||||||
def Ucs2Search(name):
|
def Ucs2Search(name):
|
||||||
if name == 'ucs-2':
|
if name in ['ucs-2', 'ucs_2']:
|
||||||
return codecs.CodecInfo(
|
return codecs.CodecInfo(
|
||||||
name=name,
|
name=name,
|
||||||
encode=TheUcs2Codec.encode,
|
encode=TheUcs2Codec.encode,
|
||||||
|
@@ -1635,7 +1635,7 @@ class PeImageClass():
|
|||||||
ByteArray = array.array('B')
|
ByteArray = array.array('B')
|
||||||
ByteArray.fromfile(PeObject, 4)
|
ByteArray.fromfile(PeObject, 4)
|
||||||
# PE signature should be 'PE\0\0'
|
# PE signature should be 'PE\0\0'
|
||||||
if ByteArray.tostring() != b'PE\0\0':
|
if ByteArray.tolist() != [ord('P'), ord('E'), 0, 0]:
|
||||||
self.ErrorInfo = self.FileName + ' has no valid PE signature PE00'
|
self.ErrorInfo = self.FileName + ' has no valid PE signature PE00'
|
||||||
return
|
return
|
||||||
|
|
||||||
|
@@ -27,10 +27,11 @@ from Common.TargetTxtClassObject import TargetTxtDict
|
|||||||
from Common.ToolDefClassObject import ToolDefDict
|
from Common.ToolDefClassObject import ToolDefDict
|
||||||
from AutoGen.BuildEngine import ToolBuildRule
|
from AutoGen.BuildEngine import ToolBuildRule
|
||||||
import Common.DataType as DataType
|
import Common.DataType as DataType
|
||||||
from Common.Misc import PathClass
|
from Common.Misc import PathClass,CreateDirectory
|
||||||
from Common.LongFilePathSupport import OpenLongFilePath as open
|
from Common.LongFilePathSupport import OpenLongFilePath as open
|
||||||
from Common.MultipleWorkspace import MultipleWorkspace as mws
|
from Common.MultipleWorkspace import MultipleWorkspace as mws
|
||||||
import Common.GlobalData as GlobalData
|
import Common.GlobalData as GlobalData
|
||||||
|
from Common.BuildToolError import *
|
||||||
|
|
||||||
## Global variables
|
## Global variables
|
||||||
#
|
#
|
||||||
@@ -463,12 +464,28 @@ class GenFdsGlobalVariable:
|
|||||||
GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())
|
GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())
|
||||||
else:
|
else:
|
||||||
SectionData = array('B', [0, 0, 0, 0])
|
SectionData = array('B', [0, 0, 0, 0])
|
||||||
SectionData.fromstring(Ui.encode("utf_16_le"))
|
SectionData.fromlist(array('B',Ui.encode('utf-16-le')).tolist())
|
||||||
SectionData.append(0)
|
SectionData.append(0)
|
||||||
SectionData.append(0)
|
SectionData.append(0)
|
||||||
Len = len(SectionData)
|
Len = len(SectionData)
|
||||||
GenFdsGlobalVariable.SectionHeader.pack_into(SectionData, 0, Len & 0xff, (Len >> 8) & 0xff, (Len >> 16) & 0xff, 0x15)
|
GenFdsGlobalVariable.SectionHeader.pack_into(SectionData, 0, Len & 0xff, (Len >> 8) & 0xff, (Len >> 16) & 0xff, 0x15)
|
||||||
SaveFileOnChange(Output, SectionData.tostring())
|
|
||||||
|
|
||||||
|
DirName = os.path.dirname(Output)
|
||||||
|
if not CreateDirectory(DirName):
|
||||||
|
EdkLogger.error(None, FILE_CREATE_FAILURE, "Could not create directory %s" % DirName)
|
||||||
|
else:
|
||||||
|
if DirName == '':
|
||||||
|
DirName = os.getcwd()
|
||||||
|
if not os.access(DirName, os.W_OK):
|
||||||
|
EdkLogger.error(None, PERMISSION_FAILURE, "Do not have write permission on directory %s" % DirName)
|
||||||
|
|
||||||
|
try:
|
||||||
|
with open(Output, "wb") as Fd:
|
||||||
|
SectionData.tofile(Fd)
|
||||||
|
Fd.flush()
|
||||||
|
except IOError as X:
|
||||||
|
EdkLogger.error(None, FILE_CREATE_FAILURE, ExtraData='IOError %s' % X)
|
||||||
|
|
||||||
elif Ver:
|
elif Ver:
|
||||||
Cmd += ("-n", Ver)
|
Cmd += ("-n", Ver)
|
||||||
|
Reference in New Issue
Block a user