File ovmf.43bec9ea3d56f3662ede78023baa2a791b66acac.p... of Package xen

Overview Repositories Revisions Requests Users Attributes Meta

File ovmf.43bec9ea3d56f3662ede78023baa2a791b66acac.patch of Package xen

From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 12 Aug 2020 01:28:18 +0800
Subject: 43bec9ea3d56f3662ede78023baa2a791b66acac

BaseTools: Work around array.array.tostring() removal in python 3.9

In python3, array.array.tostring() was a compat alias for tobytes().
tostring() was removed in python 3.9.

Convert this to use tolist() which should be valid for all python
versions.

This fixes this build error on python3.9:

(Python 3.9.0b5 on linux) Traceback (most recent call last):
  File "/root/edk2/edk2-edk2-stable202002/BaseTools/BinWrappers/PosixLike/../../Source/Python/Trim/Trim.py", line 593, in Main
    GenerateVfrBinSec(CommandOptions.ModuleName, CommandOptions.DebugDir, CommandOptions.OutputFile)
  File "/root/edk2/edk2-edk2-stable202002/BaseTools/BinWrappers/PosixLike/../../Source/Python/Trim/Trim.py", line 449, in GenerateVfrBinSec
    VfrUniOffsetList = GetVariableOffset(MapFileName, EfiFileName, VfrNameList)
  File "/root/edk2/edk2-edk2-stable202002/BaseTools/Source/Python/Common/Misc.py", line 88, in GetVariableOffset
    return _parseForGCC(lines, efifilepath, varnames)
  File "/root/edk2/edk2-edk2-stable202002/BaseTools/Source/Python/Common/Misc.py", line 151, in _parseForGCC
    efisecs = PeImageClass(efifilepath).SectionHeaderList
  File "/root/edk2/edk2-edk2-stable202002/BaseTools/Source/Python/Common/Misc.py", line 1638, in __init__
    if ByteArray.tostring() != b'PE\0\0':
AttributeError: 'array.array' object has no attribute 'tostring'

Signed-off-by: Cole Robinson <crobinso@redhat.com>
Reviewed-by: Yuwei Chen <yuwei.chen@intel.com>
Reviewed-by: Bob Feng <bob.c.feng@intel.com>
---
 BaseTools/Source/Python/Common/Misc.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/BaseTools/Source/Python/Common/Misc.py
+++ b/BaseTools/Source/Python/Common/Misc.py
@@ -1626,25 +1626,25 @@ class PeImageClass():
         ByteList = ByteArray.tolist()
         # DOS signature should be 'MZ'
         if self._ByteListToStr (ByteList[0x0:0x2]) != 'MZ':
             self.ErrorInfo = self.FileName + ' has no valid DOS signature MZ'
             return
 
         # Read 4 byte PE Signature
         PeOffset = self._ByteListToInt(ByteList[0x3C:0x3E])
         PeObject.seek(PeOffset)
         ByteArray = array.array('B')
         ByteArray.fromfile(PeObject, 4)
         # 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'
             return
 
         # Read PE file header
         ByteArray = array.array('B')
         ByteArray.fromfile(PeObject, 0x14)
         ByteList = ByteArray.tolist()
         SecNumber = self._ByteListToInt(ByteList[0x2:0x4])
         if SecNumber == 0:
             self.ErrorInfo = self.FileName + ' has no section header'
             return

Places

File ovmf.43bec9ea3d56f3662ede78023baa2a791b66acac.patch of Package xen

Places