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

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

[Ashraf Ali S]

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@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Debkumar De <debkumar.de@intel.com>
Cc: Harry Han <harry.han@intel.com>
Cc: Catharine West <catharine.west@intel.com>
Cc: Sangeetha V <sangeetha.v@intel.com>

Signed-off-by: Ashraf Ali S <ashraf.ali.s@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

[PATCH v2 2/2] UefiCpuPkg: ResetVector Tool additional debug prints

[Ashraf Ali S]

REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3506

Before executing the nasm command, added print statement to know what
commands are executing.
before printing the output file need check the status of command which
is executed. if the status is 0 then only print the output file name.

Cc: Ray Ni <ray.ni@intel.com>
Cc: Rahul Kumar <rahul1.kumar@intel.com>
Cc: Debkumar De <debkumar.de@intel.com>
Cc: Harry Han <harry.han@intel.com>
Cc: Catharine West <catharine.west@intel.com>
Cc: Sangeetha V <sangeetha.v@intel.com>
Signed-off-by: Ashraf Ali S <ashraf.ali.s@intel.com>
---
 UefiCpuPkg/ResetVector/Vtf0/Build.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/UefiCpuPkg/ResetVector/Vtf0/Build.py b/UefiCpuPkg/ResetVector/Vtf0/Build.py
index 55f4edd87b..b791d32762 100644
--- a/UefiCpuPkg/ResetVector/Vtf0/Build.py
+++ b/UefiCpuPkg/ResetVector/Vtf0/Build.py
@@ -32,9 +32,12 @@ for arch in ('ia32', 'x64'):
             '-o', output,
             'Vtf0.nasmb',
             )
+        print(f"Command : {' '.join(commandLine)}")
         ret = RunCommand(commandLine)
+        if ret != 0:
+            print(f"something went wrong while executing {commandLine[-1]}")
+            sys.exit()
         print('\tASM\t' + output)
-        if ret != 0: sys.exit(ret)
 
         commandLine = (
             'python',
-- 
2.30.2.windows.1

Re: [PATCH v2 1/2] UefiCpuPkg: ResetVector Tool Support for Python 3

[Ni, Ray]

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

> -----Original Message-----
> From: S, Ashraf Ali <ashraf.ali.s@intel.com>
> Sent: Friday, July 23, 2021 4:40 PM
> To: devel@edk2.groups.io
> Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Ni, Ray <ray.ni@intel.com>; Kumar, Rahul1 <rahul1.kumar@intel.com>; De,
> Debkumar <debkumar.de@intel.com>; Han, Harry <harry.han@intel.com>; West, Catharine <catharine.west@intel.com>; V,
> Sangeetha <sangeetha.v@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@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Cc: Debkumar De <debkumar.de@intel.com>
> Cc: Harry Han <harry.han@intel.com>
> Cc: Catharine West <catharine.west@intel.com>
> Cc: Sangeetha V <sangeetha.v@intel.com>
> 
> Signed-off-by: Ashraf Ali S <ashraf.ali.s@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

Re: [PATCH v2 2/2] UefiCpuPkg: ResetVector Tool additional debug prints

[Ni, Ray]

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

> -----Original Message-----
> From: S, Ashraf Ali <ashraf.ali.s@intel.com>
> Sent: Friday, July 23, 2021 4:40 PM
> To: devel@edk2.groups.io
> Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Ni, Ray <ray.ni@intel.com>; Kumar, Rahul1 <rahul1.kumar@intel.com>; De,
> Debkumar <debkumar.de@intel.com>; Han, Harry <harry.han@intel.com>; West, Catharine <catharine.west@intel.com>; V,
> Sangeetha <sangeetha.v@intel.com>
> Subject: [PATCH v2 2/2] UefiCpuPkg: ResetVector Tool additional debug prints
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3506
> 
> Before executing the nasm command, added print statement to know what
> commands are executing.
> before printing the output file need check the status of command which
> is executed. if the status is 0 then only print the output file name.
> 
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Cc: Debkumar De <debkumar.de@intel.com>
> Cc: Harry Han <harry.han@intel.com>
> Cc: Catharine West <catharine.west@intel.com>
> Cc: Sangeetha V <sangeetha.v@intel.com>
> Signed-off-by: Ashraf Ali S <ashraf.ali.s@intel.com>
> ---
>  UefiCpuPkg/ResetVector/Vtf0/Build.py | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/UefiCpuPkg/ResetVector/Vtf0/Build.py b/UefiCpuPkg/ResetVector/Vtf0/Build.py
> index 55f4edd87b..b791d32762 100644
> --- a/UefiCpuPkg/ResetVector/Vtf0/Build.py
> +++ b/UefiCpuPkg/ResetVector/Vtf0/Build.py
> @@ -32,9 +32,12 @@ for arch in ('ia32', 'x64'):
>              '-o', output,
>              'Vtf0.nasmb',
>              )
> +        print(f"Command : {' '.join(commandLine)}")
>          ret = RunCommand(commandLine)
> +        if ret != 0:
> +            print(f"something went wrong while executing {commandLine[-1]}")
> +            sys.exit()
>          print('\tASM\t' + output)
> -        if ret != 0: sys.exit(ret)
> 
>          commandLine = (
>              'python',
> --
> 2.30.2.windows.1

Re: [PATCH v2 2/2] UefiCpuPkg: ResetVector Tool additional debug prints

[Ashraf Ali S]

Hi.,

Is this Patch Uploaded in GitHub?

Regards,
Ashraf Ali S
Intel Technology India Pvt. Ltd. 

-----Original Message-----
From: Ni, Ray <ray.ni@intel.com> 
Sent: Tuesday, July 27, 2021 10:42 AM
To: S, Ashraf Ali <ashraf.ali.s@intel.com>; devel@edk2.groups.io
Cc: Kumar, Rahul1 <rahul1.kumar@intel.com>; De, Debkumar <debkumar.de@intel.com>; Han, Harry <harry.han@intel.com>; West, Catharine <catharine.west@intel.com>; V, Sangeetha <sangeetha.v@intel.com>
Subject: RE: [PATCH v2 2/2] UefiCpuPkg: ResetVector Tool additional debug prints

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

> -----Original Message-----
> From: S, Ashraf Ali <ashraf.ali.s@intel.com>
> Sent: Friday, July 23, 2021 4:40 PM
> To: devel@edk2.groups.io
> Cc: S, Ashraf Ali <ashraf.ali.s@intel.com>; Ni, Ray 
> <ray.ni@intel.com>; Kumar, Rahul1 <rahul1.kumar@intel.com>; De, 
> Debkumar <debkumar.de@intel.com>; Han, Harry <harry.han@intel.com>; 
> West, Catharine <catharine.west@intel.com>; V, Sangeetha 
> <sangeetha.v@intel.com>
> Subject: [PATCH v2 2/2] UefiCpuPkg: ResetVector Tool additional debug 
> prints
> 
> REF:https://bugzilla.tianocore.org/show_bug.cgi?id=3506
> 
> Before executing the nasm command, added print statement to know what 
> commands are executing.
> before printing the output file need check the status of command which 
> is executed. if the status is 0 then only print the output file name.
> 
> Cc: Ray Ni <ray.ni@intel.com>
> Cc: Rahul Kumar <rahul1.kumar@intel.com>
> Cc: Debkumar De <debkumar.de@intel.com>
> Cc: Harry Han <harry.han@intel.com>
> Cc: Catharine West <catharine.west@intel.com>
> Cc: Sangeetha V <sangeetha.v@intel.com>
> Signed-off-by: Ashraf Ali S <ashraf.ali.s@intel.com>
> ---
>  UefiCpuPkg/ResetVector/Vtf0/Build.py | 5 ++++-
>  1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/UefiCpuPkg/ResetVector/Vtf0/Build.py 
> b/UefiCpuPkg/ResetVector/Vtf0/Build.py
> index 55f4edd87b..b791d32762 100644
> --- a/UefiCpuPkg/ResetVector/Vtf0/Build.py
> +++ b/UefiCpuPkg/ResetVector/Vtf0/Build.py
> @@ -32,9 +32,12 @@ for arch in ('ia32', 'x64'):
>              '-o', output,
>              'Vtf0.nasmb',
>              )
> +        print(f"Command : {' '.join(commandLine)}")
>          ret = RunCommand(commandLine)
> +        if ret != 0:
> +            print(f"something went wrong while executing {commandLine[-1]}")
> +            sys.exit()
>          print('\tASM\t' + output)
> -        if ret != 0: sys.exit(ret)
> 
>          commandLine = (
>              'python',
> --
> 2.30.2.windows.1