Switch to python3, resolve issue with differences in encrypt in python3

Change-Id: Ic6105abb59030960ed8bf9a16a30cfd90b0a4742
intel · Jul 8, 2020 · 5005890 · 5005890
1 parent 0e35a4a
commit 5005890
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,13 +33,12 @@ cmake_minimum_required(VERSION 3.4.3)
 if(BS_USE_OSDM_BUILD_SYSTEM)
     include(${BUILD_SYS_INC}/utils.cmake)
     bs_find_patch()
-    bs_find_python2()
 else()
     if (NOT PATCH)
         find_program(PATCH NAMES patch patch.exe)
     endif()
     if (NOT PYTHON)
-        find_program(PYTHON NAMES python2 python python2.exe python.exe)
+        find_program(PYTHON NAMES python3 python python3.exe python.exe)
     endif()
 endif()
 

diff --git a/releases/10.0.0/patches_internal/configure_file-race-fix.patch b/releases/10.0.0/patches_internal/configure_file-race-fix.patch
@@ -16,7 +16,7 @@ diff -Naur --strip-trailing-cr a/utils/llvm-build/llvmbuild/main.py b/utils/llvm
 -               ${CMAKE_CURRENT_BINARY_DIR}/DummyConfigureOutput)\n""" % (
 -                cmake_quote_path(dep),))
 +               ${CMAKE_CURRENT_BINARY_DIR}/DummyConfigureOutput/%s)\n""" % (
-+                cmake_quote_path(dep),hashlib.sha1(dep).hexdigest()))
++                cmake_quote_path(dep),hashlib.sha1(dep.encode('utf-8')).hexdigest()))
 
          # Write the properties we use to encode the required library dependency
          # information in a form CMake can easily use directly.