1 files changed, 49 insertions, 0 deletions
diff --git a/system/xen/patches/0001-BaseTools-fix-ucs-2-lookup-on-python-3.9.patch b/system/xen/patches/0001-BaseTools-fix-ucs-2-lookup-on-python-3.9.patch
new file mode 100644
index 0000000000000..f40f815cc4038
--- /dev/null
+++ b/system/xen/patches/0001-BaseTools-fix-ucs-2-lookup-on-python-3.9.patch
@@ -0,0 +1,49 @@
+From a32df3463befa04913fd1934ed264038a9eae00f Mon Sep 17 00:00:00 2001
+Message-Id: <a32df3463befa04913fd1934ed264038a9eae00f.1596577611.git.crobinso@redhat.com>
+From: Cole Robinson <crobinso@redhat.com>
+Date: Tue, 4 Aug 2020 17:04:50 -0400
+Subject: [PATCH 1/2] BaseTools: fix ucs-2 lookup on python 3.9
+
+python3.9 changed/fixed codec.register behavior to always replace
+hyphen with underscore for passed in codec names:
+
+  https://bugs.python.org/issue37751
+
+So the custom Ucs2Search needs to be adapted to handle 'ucs_2' in
+addition to existing 'ucs-2' for back compat.
+
+This fixes test failures on python3.9, example:
+
+======================================================================
+FAIL: testUtf16InUniFile (CheckUnicodeSourceFiles.Tests)
+----------------------------------------------------------------------
+Traceback (most recent call last):
+  File "/builddir/build/BUILD/edk2-edk2-stable202002/BaseTools/Source/Python/AutoGen/UniClassObject.py", line 375, in PreProcess
+    FileIn = UniFileClassObject.OpenUniFile(LongFilePath(File.Path))
+  File "/builddir/build/BUILD/edk2-edk2-stable202002/BaseTools/Source/Python/AutoGen/UniClassObject.py", line 303, in OpenUniFile
+    UniFileClassObject.VerifyUcs2Data(FileIn, FileName, Encoding)
+  File "/builddir/build/BUILD/edk2-edk2-stable202002/BaseTools/Source/Python/AutoGen/UniClassObject.py", line 312, in VerifyUcs2Data
+    Ucs2Info = codecs.lookup('ucs-2')
+LookupError: unknown encoding: ucs-2
+
+Signed-off-by: Cole Robinson <crobinso@redhat.com>
+---
+ BaseTools/Source/Python/AutoGen/UniClassObject.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/BaseTools/Source/Python/AutoGen/UniClassObject.py b/BaseTools/Source/Python/AutoGen/UniClassObject.py
+index b2895f7e5c..883c2356e0 100644
+--- a/BaseTools/Source/Python/AutoGen/UniClassObject.py
++++ b/BaseTools/Source/Python/AutoGen/UniClassObject.py
+@@ -152,7 +152,7 @@ class Ucs2Codec(codecs.Codec):
+ 
+ TheUcs2Codec = Ucs2Codec()
+ def Ucs2Search(name):
+-    if name == 'ucs-2':
++    if name in ['ucs-2', 'ucs_2']:
+         return codecs.CodecInfo(
+             name=name,
+             encode=TheUcs2Codec.encode,
+-- 
+2.26.2
+