[edk2-devel] [PATCH v2 1/2] UefiCpuPkg: ResetVector Tool Support for Python 3

[Ni, Ray]

Reviewed-by: Ray Ni <ray.ni at Intel.com>

> -----Original Message-----
> From: S, Ashraf Ali <ashraf.ali.s at intel.com>
> Sent: Friday, July 23, 2021 4:40 PM
> To: devel at edk2.groups.io
> Cc: S, Ashraf Ali <ashraf.ali.s at intel.com>; Ni, Ray <ray.ni at intel.com>; Kumar, Rahul1 <rahul1.kumar at intel.com>; De,
> Debkumar <debkumar.de at intel.com>; Han, Harry <harry.han at intel.com>; West, Catharine <catharine.west at intel.com>; V,
> Sangeetha <sangeetha.v at intel.com>
> Subject: [PATCH v2 1/2] UefiCpuPkg: ResetVector Tool Support for Python 3
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3506
> 
> Build Scrips for Reset Vector currently based on Python 2
> which is already EOL, needs to modify the build script based on
> Python 3
> 
> Cc: Ray Ni <ray.ni at intel.com>
> Cc: Rahul Kumar <rahul1.kumar at intel.com>
> Cc: Debkumar De <debkumar.de at intel.com>
> Cc: Harry Han <harry.han at intel.com>
> Cc: Catharine West <catharine.west at intel.com>
> Cc: Sangeetha V <sangeetha.v at intel.com>
> 
> Signed-off-by: Ashraf Ali S <ashraf.ali.s at intel.com>
> ---
>  UefiCpuPkg/ResetVector/Vtf0/Build.py                    | 6 +++---
>  UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py | 4 ++--
>  2 files changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/UefiCpuPkg/ResetVector/Vtf0/Build.py b/UefiCpuPkg/ResetVector/Vtf0/Build.py
> index 343c53b5ff..55f4edd87b 100644
> --- a/UefiCpuPkg/ResetVector/Vtf0/Build.py
> +++ b/UefiCpuPkg/ResetVector/Vtf0/Build.py
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Automate the process of building the various reset vector types
>  #
> -#  Copyright (c) 2009, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2009 - 2021, Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -33,7 +33,7 @@ for arch in ('ia32', 'x64'):
>              'Vtf0.nasmb',
>              )
>          ret = RunCommand(commandLine)
> -        print '\tASM\t' + output
> +        print('\tASM\t' + output)
>          if ret != 0: sys.exit(ret)
> 
>          commandLine = (
> @@ -41,7 +41,7 @@ for arch in ('ia32', 'x64'):
>              'Tools/FixupForRawSection.py',
>              output,
>              )
> -        print '\tFIXUP\t' + output
> +        print('\tFIXUP\t' + output)
>          ret = RunCommand(commandLine)
>          if ret != 0: sys.exit(ret)
> 
> diff --git a/UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py
> b/UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py
> index c77438a0ce..de771eba22 100644
> --- a/UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py
> +++ b/UefiCpuPkg/ResetVector/Vtf0/Tools/FixupForRawSection.py
> @@ -1,7 +1,7 @@
>  ## @file
>  #  Apply fixup to VTF binary image for FFS Raw section
>  #
> -#  Copyright (c) 2008, Intel Corporation. All rights reserved.<BR>
> +#  Copyright (c) 2008 - 2021, Intel Corporation. All rights reserved.<BR>
>  #
>  #  SPDX-License-Identifier: BSD-2-Clause-Patent
>  #
> @@ -15,6 +15,6 @@ c = ((len(d) + 4 + 7) & ~7) - 4
>  if c > len(d):
>      c -= len(d)
>      f = open(sys.argv[1], 'wb')
> -    f.write('\x90' * c)
> +    f.write(b'\x90' * c)
>      f.write(d)
>      f.close()
> --
> 2.30.2.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#78188): https://edk2.groups.io/g/devel/message/78188
Mute This Topic: https://groups.io/mt/84397005/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-