Re: [edk2-devel] [edk2-platforms][PATCH v1] PurleyOpenBoardPkg: Replace Python Interpreter Name

2023-11-28 Thread Nate DeSimone 
Pushed as 15e9fae

-Original Message-
From: devel@edk2.groups.io  On Behalf Of Nate DeSimone
Sent: Friday, November 17, 2023 10:36 PM
To: devel@edk2.groups.io
Cc: Chiu, Chasel 
Subject: [edk2-devel] [edk2-platforms][PATCH v1] PurleyOpenBoardPkg: Replace 
Python Interpreter Name

Removes the assumption that the python interpreter will have the name python.

Cc: Chasel Chiu 
Signed-off-by: Nate DeSimone 
---
 .../PurleyOpenBoardPkg/BoardMtOlympus/build_board.py   |  8 
 .../PurleyOpenBoardPkg/BoardTiogaPass/build_board.py   | 10 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py 
b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
index 2ba615d3e4..ffe762e289 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
@@ -1,7 +1,7 @@
 # @ build_board.py
 # This adds additional functions to the build_bios.py  # -# Copyright (c) 
2019, Intel Corporation. All rights reserved.
+# Copyright (c) 2019 - 2023, Intel Corporation. All rights 
+reserved.
 # SPDX-License-Identifier: BSD-2-Clause-Patent  #
 
@@ -48,7 +48,7 @@ def pre_build_ex(config, functions):
 print("AML_FILTER= ", config.get("AML_FILTER"))
 
 # build the command with arguments
-command = ["python",
+command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
 "AmlGenOffset",
 "AmlGenOffset.py"), @@ -110,7 +110,7 @@ def 
post_build_ex(config, functions):
 print("post_build_ex Error")
 sys.exit(1)
 
-common_patch_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_patch_command = [sys.executable,
 os.path.join(config["MIN_PACKAGE_TOOLS"],
  "PatchFv", "PatchBinFv.py"),
 config["TARGET"], @@ -131,7 +131,7 @@ def 
post_build_ex(config, functions):
 print("Patch Error!")
 sys.exit(1)
 
-common_rebase_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_rebase_command = [sys.executable,
  os.path.join(config["MIN_PACKAGE_TOOLS"],
   "PatchFv", "RebaseBinFv.py"),
  config["TARGET"], diff --git 
a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py 
b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
index 46fd389ef1..3b66df7115 100644
--- a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
+++ b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
@@ -1,7 +1,7 @@
 # @ build_board.py
 # This adds additional functions to the build_bios.py  # -# Copyright (c) 
2018, Intel Corporation. All rights reserved.
+# Copyright (c) 2018 - 2023, Intel Corporation. All rights 
+reserved.
 # Copyright (c) 2021, American Megatrends International LLC.  # 
SPDX-License-Identifier: BSD-2-Clause-Patent  # @@ -49,7 +49,7 @@ def 
pre_build_ex(config, functions):
 print("AML_FILTER= ", config.get("AML_FILTER"))
 
 # build the command with arguments
-command = ["python",
+command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
 "AmlGenOffset",
 "AmlGenOffset.py"), @@ -111,7 +111,7 @@ def 
post_build_ex(config, functions):
 print("post_build_ex Error")
 sys.exit(1)
 
-common_patch_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_patch_command = [sys.executable,
 os.path.join(config["MIN_PACKAGE_TOOLS"],
  "PatchFv", "PatchBinFv.py"),
 config["TARGET"], @@ -132,7 +132,7 @@ def 
post_build_ex(config, functions):
 print("Patch Error!")
 sys.exit(1)
 
-common_rebase_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_rebase_command = [sys.executable,
  os.path.join(config["MIN_PACKAGE_TOOLS"],
   "PatchFv", "RebaseBinFv.py"),
  config["TARGET"], @@ -161,7 +161,7 @@ def 
post_build_ex(config, functions):
 print("Patch Error!")
 sys.exit(1)
 
-common_patchbfv_command = [os.path.join(config["PYTHON_HOME"], "python"),
+common_patchbfv_command = [sys.executable,
os.path.join(config["MIN_PACKAGE_TOOLS"],
   "PatchFv", "PatchBfv.py"),
os.path.join(config["BUILD_DIR_PATH"],
--
2.34.1








-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#111827): https://edk2.groups.io/g/devel/message/111827
Mute This Topic:

Re: [edk2-devel] [edk2-platforms][PATCH v1] PurleyOpenBoardPkg: Replace Python Interpreter Name

2023-11-27 Thread Chiu, Chasel 


Reviewed-by: Chasel Chiu 

Thanks,
Chasel


> -Original Message-
> From: Desimone, Nathaniel L 
> Sent: Friday, November 17, 2023 10:36 PM
> To: devel@edk2.groups.io
> Cc: Chiu, Chasel 
> Subject: [edk2-platforms][PATCH v1] PurleyOpenBoardPkg: Replace Python
> Interpreter Name
> 
> Removes the assumption that the python interpreter will have the name python.
> 
> Cc: Chasel Chiu 
> Signed-off-by: Nate DeSimone 
> ---
>  .../PurleyOpenBoardPkg/BoardMtOlympus/build_board.py   |  8 
>  .../PurleyOpenBoardPkg/BoardTiogaPass/build_board.py   | 10 +-
>  2 files changed, 9 insertions(+), 9 deletions(-)
> 
> diff --git a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
> b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
> index 2ba615d3e4..ffe762e289 100644
> --- a/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
> +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardMtOlympus/build_board.py
> @@ -1,7 +1,7 @@
>  # @ build_board.py
>  # This adds additional functions to the build_bios.py  # -# Copyright (c) 
> 2019, Intel
> Corporation. All rights reserved.
> +# Copyright (c) 2019 - 2023, Intel Corporation. All rights
> +reserved.
>  # SPDX-License-Identifier: BSD-2-Clause-Patent  #
> 
> @@ -48,7 +48,7 @@ def pre_build_ex(config, functions):
>  print("AML_FILTER= ", config.get("AML_FILTER"))
> 
>  # build the command with arguments
> -command = ["python",
> +command = [sys.executable,
> os.path.join(config["MIN_PACKAGE_TOOLS"],
>  "AmlGenOffset",
>  "AmlGenOffset.py"), @@ -110,7 +110,7 @@ def
> post_build_ex(config, functions):
>  print("post_build_ex Error")
>  sys.exit(1)
> 
> -common_patch_command = [os.path.join(config["PYTHON_HOME"],
> "python"),
> +common_patch_command = [sys.executable,
>  os.path.join(config["MIN_PACKAGE_TOOLS"],
>   "PatchFv", "PatchBinFv.py"),
>  config["TARGET"], @@ -131,7 +131,7 @@ def
> post_build_ex(config, functions):
>  print("Patch Error!")
>  sys.exit(1)
> 
> -common_rebase_command = [os.path.join(config["PYTHON_HOME"],
> "python"),
> +common_rebase_command = [sys.executable,
>   os.path.join(config["MIN_PACKAGE_TOOLS"],
>"PatchFv", "RebaseBinFv.py"),
>   config["TARGET"], diff --git
> a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
> b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
> index 46fd389ef1..3b66df7115 100644
> --- a/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
> +++ b/Platform/Intel/PurleyOpenBoardPkg/BoardTiogaPass/build_board.py
> @@ -1,7 +1,7 @@
>  # @ build_board.py
>  # This adds additional functions to the build_bios.py  # -# Copyright (c) 
> 2018, Intel
> Corporation. All rights reserved.
> +# Copyright (c) 2018 - 2023, Intel Corporation. All rights
> +reserved.
>  # Copyright (c) 2021, American Megatrends International LLC.  # SPDX-
> License-Identifier: BSD-2-Clause-Patent  # @@ -49,7 +49,7 @@ def
> pre_build_ex(config, functions):
>  print("AML_FILTER= ", config.get("AML_FILTER"))
> 
>  # build the command with arguments
> -command = ["python",
> +command = [sys.executable,
> os.path.join(config["MIN_PACKAGE_TOOLS"],
>  "AmlGenOffset",
>  "AmlGenOffset.py"), @@ -111,7 +111,7 @@ def
> post_build_ex(config, functions):
>  print("post_build_ex Error")
>  sys.exit(1)
> 
> -common_patch_command = [os.path.join(config["PYTHON_HOME"],
> "python"),
> +common_patch_command = [sys.executable,
>  os.path.join(config["MIN_PACKAGE_TOOLS"],
>   "PatchFv", "PatchBinFv.py"),
>  config["TARGET"], @@ -132,7 +132,7 @@ def
> post_build_ex(config, functions):
>  print("Patch Error!")
>  sys.exit(1)
> 
> -common_rebase_command = [os.path.join(config["PYTHON_HOME"],
> "python"),
> +common_rebase_command = [sys.executable,
>   os.path.join(config["MIN_PACKAGE_TOOLS"],
>"PatchFv", "RebaseBinFv.py"),
>   config["TARGET"], @@ -161,7 +161,7 @@ def
> post_build_ex(config, functions):
>  print("Patch Error!")
>  sys.exit(1)
> 
> -common_patchbfv_command = [os.path.join(config["PYTHON_HOME"],
> "python"),
> +common_patchbfv_command = [sys.executable,
> os.path.join(config["MIN_PACKAGE_TOOLS"],
>"PatchFv", "PatchBfv.py"),
> os.path.join(config["BUILD_DIR_PATH"],
> --
> 2.34.1