## @file\r
# generate capsule\r
#\r
-# Copyright (c) 2007 - 2016, 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
from CommonDataClass.FdfClass import CapsuleClassObject\r
import Common.LongFilePathOs as os\r
import subprocess\r
-import StringIO\r
+from io import BytesIO\r
from Common.Misc import SaveFileOnChange\r
from GenFds import GenFds\r
from Common.Misc import PackRegistryFormatGuid\r
# UINT32 CapsuleImageSize;\r
# } EFI_CAPSULE_HEADER;\r
#\r
- Header = StringIO.StringIO()\r
+ Header = BytesIO()\r
#\r
# Use FMP capsule GUID: 6DCBD5ED-E82D-4C44-BDA1-7194199AD92A\r
#\r
# // UINT64 ItemOffsetList[];\r
# } EFI_FIRMWARE_MANAGEMENT_CAPSULE_HEADER;\r
#\r
- FwMgrHdr = StringIO.StringIO()\r
+ FwMgrHdr = BytesIO()\r
if 'CAPSULE_HEADER_INIT_VERSION' in self.TokensDict:\r
FwMgrHdr.write(pack('=I', int(self.TokensDict['CAPSULE_HEADER_INIT_VERSION'], 16)))\r
else:\r
#\r
\r
PreSize = FwMgrHdrSize\r
- Content = StringIO.StringIO()\r
+ Content = BytesIO()\r
for driver in self.CapsuleDataList:\r
FileName = driver.GenCapsuleSubItem()\r
FwMgrHdr.write(pack('=Q', PreSize))\r
Content.write(File.read())\r
File.close()\r
for fmp in self.FmpPayloadList:\r
+ if fmp.Existed:\r
+ FwMgrHdr.write(pack('=Q', PreSize))\r
+ PreSize += len(fmp.Buffer)\r
+ Content.write(fmp.Buffer)\r
+ continue\r
+ if fmp.ImageFile:\r
+ for Obj in fmp.ImageFile:\r
+ fmp.ImageFile = Obj.GenCapsuleSubItem()\r
+ if fmp.VendorCodeFile:\r
+ for Obj in fmp.VendorCodeFile:\r
+ fmp.VendorCodeFile = Obj.GenCapsuleSubItem()\r
if fmp.Certificate_Guid:\r
ExternalTool, ExternalOption = FindExtendTool([], GenFdsGlobalVariable.ArchList, fmp.Certificate_Guid)\r
CmdOption = ''\r
if not os.path.isabs(fmp.ImageFile):\r
CapInputFile = os.path.join(GenFdsGlobalVariable.WorkSpaceDir, fmp.ImageFile)\r
CapOutputTmp = os.path.join(GenFdsGlobalVariable.FvDir, self.UiCapsuleName) + '.tmp'\r
- if ExternalTool == None:\r
+ if ExternalTool is None:\r
EdkLogger.error("GenFds", GENFDS_ERROR, "No tool found with GUID %s" % fmp.Certificate_Guid)\r
else:\r
CmdOption += ExternalTool\r
dwLength = 4 + 2 + 2 + 16 + 16 + 256 + 256\r
fmp.ImageFile = CapOutputTmp\r
AuthData = [fmp.MonotonicCount, dwLength, WIN_CERT_REVISION, WIN_CERT_TYPE_EFI_GUID, fmp.Certificate_Guid]\r
- Buffer = fmp.GenCapsuleSubItem(AuthData)\r
+ fmp.Buffer = fmp.GenCapsuleSubItem(AuthData)\r
else:\r
- Buffer = fmp.GenCapsuleSubItem()\r
+ fmp.Buffer = fmp.GenCapsuleSubItem()\r
FwMgrHdr.write(pack('=Q', PreSize))\r
- PreSize += len(Buffer)\r
- Content.write(Buffer)\r
+ PreSize += len(fmp.Buffer)\r
+ Content.write(fmp.Buffer)\r
BodySize = len(FwMgrHdr.getvalue()) + len(Content.getvalue())\r
Header.write(pack('=I', HdrSize + BodySize))\r
#\r
# @retval string Generated Capsule file path\r
#\r
def GenCapsule(self):\r
- if self.UiCapsuleName.upper() + 'cap' in GenFds.ImageBinDict.keys():\r
+ if self.UiCapsuleName.upper() + 'cap' in GenFds.ImageBinDict:\r
return GenFds.ImageBinDict[self.UiCapsuleName.upper() + 'cap']\r
\r
GenFdsGlobalVariable.InfLogger( "\nGenerate %s Capsule" %self.UiCapsuleName)\r
def GenCapInf(self):\r
self.CapInfFileName = os.path.join(GenFdsGlobalVariable.FvDir,\r
self.UiCapsuleName + "_Cap" + '.inf')\r
- CapInfFile = StringIO.StringIO() #open (self.CapInfFileName , 'w+')\r
+ CapInfFile = BytesIO() #open (self.CapInfFileName , 'w+')\r
\r
CapInfFile.writelines("[options]" + T_CHAR_LF)\r
\r
- for Item in self.TokensDict.keys():\r
+ for Item in self.TokensDict:\r
CapInfFile.writelines("EFI_" + \\r
Item + \\r
' = ' + \\r
- self.TokensDict.get(Item) + \\r
+ self.TokensDict[Item] + \\r
T_CHAR_LF)\r
\r
return CapInfFile\r