76 lines
3.2 KiB
Diff
76 lines
3.2 KiB
Diff
|
From 28bd5e98630cc22830ed352c248bafdb60794391 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
Date: Tue, 29 Dec 2020 17:03:53 +0800
|
||
|
|
Subject: BaseTools: Fix the issue caused by tostring() removal on Py39
|
||
|
|
|
||
|
|
REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3136
|
||
|
|
|
||
|
|
Python 3.9 remove the array.array.tostring and
|
||
|
|
array.array.fromstring() function. This patch
|
||
|
|
is to use other method to replace tostring() and
|
||
|
|
fromstring()
|
||
|
|
|
||
|
|
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
|
||
|
|
|
||
|
|
Cc: Liming Gao <gaoliming@byosoft.com.cn>
|
||
|
|
Cc: Yuwei Chen <yuwei.chen@intel.com>
|
||
|
|
Cc: Mingyue Liang <mingyuex.liang@intel.com>
|
||
|
|
Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
|
||
|
|
(cherry picked from commit 20b292d0cdf7dce58d824fdf9ab1613c2a1ad2ec)
|
||
|
|
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
||
|
|
---
|
||
|
|
.../Python/GenFds/GenFdsGlobalVariable.py | 23 ++++++++++++++++---
|
||
|
|
1 file changed, 20 insertions(+), 3 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
|
||
|
|
index dc1727c466..3019ec63c3 100644
|
||
|
|
--- a/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
|
||
|
|
+++ b/BaseTools/Source/Python/GenFds/GenFdsGlobalVariable.py
|
||
|
|
@@ -27,10 +27,11 @@ from Common.TargetTxtClassObject import TargetTxtDict
|
||
|
|
from Common.ToolDefClassObject import ToolDefDict
|
||
|
|
from AutoGen.BuildEngine import ToolBuildRule
|
||
|
|
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.MultipleWorkspace import MultipleWorkspace as mws
|
||
|
|
import Common.GlobalData as GlobalData
|
||
|
|
+from Common.BuildToolError import *
|
||
|
|
|
||
|
|
## Global variables
|
||
|
|
#
|
||
|
|
@@ -463,12 +464,28 @@ class GenFdsGlobalVariable:
|
||
|
|
GenFdsGlobalVariable.SecCmdList.append(' '.join(Cmd).strip())
|
||
|
|
else:
|
||
|
|
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)
|
||
|
|
Len = len(SectionData)
|
||
|
|
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:
|
||
|
|
Cmd += ("-n", Ver)
|
||
|
|
--
|
||
|
|
2.18.4
|
||
|
|
|