1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [PATCH v3] MinPlatformPkg/Fsp: Rebase fail when python tools path exist whitespace REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3412

IanX Kuo posted 1 patch 2 years, 11 months ago
Failed in applying to current master (apply log)
.../Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py            | 6 +++---
.../MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py     | 6 +++---
2 files changed, 6 insertions(+), 6 deletions(-)
[edk2-devel] [PATCH v3] MinPlatformPkg/Fsp: Rebase fail when python tools path exist whitespace REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3412
Posted by IanX Kuo 2 years, 11 months ago 
From: IanX Kuo <ianx.kuo@intel.com>

(a) C:\Users\<UserName>\AppData\Local\Program\Python\Python38
(b) C:\Python38
(c) C:\Program Files\Python38
Issue only happens on (a) and (c).
(a) happen on <UserName> have whitespace. Ex: Tony Chen
(c) happen on "Program Files" have whitespace.

Cc: Chasel Chiu <chasel.chiu@intel.com>
Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
Signed-off-by: IanX Kuo <ianx.kuo@intel.com>
---
 .../Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py            | 6 +++---
 .../MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py     | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py
index 406e5ec130..f3cba2651a 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py
@@ -1,6 +1,6 @@
 ## @ RebaseAndPatchFspBinBaseAddress.py
 #
-# Copyright (c) 2017 - 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2017 - 2021, Intel Corporation. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 
@@ -93,13 +93,13 @@ fspTBaseAddress = flashBase + fspTBaseOffset
 # Re-base FSP bin file to new address and save it as fspBinFileRebased using SplitFspBin.py
 #
 rebaseArguments = fspBinFilePath + " -c s m t -b " + str(hex(fspSBaseAddress).rstrip("L")) + " " + str(hex(fspMBaseAddress).rstrip("L")) + " " + str(hex(fspTBaseAddress).rstrip("L")) + " -o" + fspBinPath + " -n " + fspBinFileRebased
-os.system(pythontool + " " + splitFspBinPath + " rebase -f" + rebaseArguments)
+os.system('"' + pythontool + '"' + " " + splitFspBinPath + " rebase -f" + rebaseArguments)
 
 #
 # Split FSP bin to FSP-S/M/T segments
 #
 splitArguments = fspBinPath + os.sep + fspBinFileRebased + " -o " + fspBinPath + " -n Fsp_Rebased.fd"
-os.system(pythontool + " " + splitFspBinPath + " split -f" + splitArguments)
+os.system('"' + pythontool + '"' + " " + splitFspBinPath + " split -f" + splitArguments)
 
 #
 # Patch dsc file with the re-based FSP-S/M/T address, so internally build will use the same.
diff --git a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py
index fb4cf4f9b7..b7e4bcf5f9 100644
--- a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py
+++ b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py
@@ -1,6 +1,6 @@
 ## @ RebaseFspBinBaseAddress.py
 #
-# Copyright (c) 2019, Intel Corporation. All rights reserved.<BR>
+# Copyright (c) 2019 - 2021, Intel Corporation. All rights reserved.<BR>
 # SPDX-License-Identifier: BSD-2-Clause-Patent
 #
 
@@ -87,12 +87,12 @@ fspTBaseAddress = flashBase + fspTBaseOffset
 # Re-base FSP bin file to new address and save it as fspBinFileRebased using SplitFspBin.py
 #
 rebaseArguments = fspBinFilePath + " -c s m t -b " + str(hex(fspSBaseAddress).rstrip("L")) + " " + str(hex(fspMBaseAddress).rstrip("L")) + " " + str(hex(fspTBaseAddress).rstrip("L")) + " -o" + fspBinPath + " -n " + fspBinFileRebased
-os.system(pythontool + " " + splitFspBinPath + " rebase -f" + rebaseArguments)
+os.system('"' + pythontool + '"' + " " + splitFspBinPath + " rebase -f" + rebaseArguments)
 
 #
 # Split FSP bin to FSP-S/M/T segments
 #
 splitArguments = fspBinPath + os.sep + fspBinFileRebased + " -o " + fspBinPath + " -n Fsp_Rebased.fd"
-os.system(pythontool + " " + splitFspBinPath + " split -f" + splitArguments)
+os.system('"' + pythontool + '"' + " " + splitFspBinPath + " split -f" + splitArguments)
 
 exit(0)
-- 
2.27.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#75504): https://edk2.groups.io/g/devel/message/75504
Mute This Topic: https://groups.io/mt/83047301/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v3] MinPlatformPkg/Fsp: Rebase fail when python tools path exist whitespace REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3412
Posted by Chiu, Chasel 2 years, 11 months ago 
With subject format correction, Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>

> -----Original Message-----
> From: Kuo, IanX <ianx.kuo@intel.com>
> Sent: Monday, May 24, 2021 6:38 AM
> To: devel@edk2.groups.io
> Cc: Kuo, IanX <ianx.kuo@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>;
> Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Subject: [PATCH v3] MinPlatformPkg/Fsp: Rebase fail when python tools path
> exist whitespace REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3412
> 
> From: IanX Kuo <ianx.kuo@intel.com>
> 
> (a) C:\Users\<UserName>\AppData\Local\Program\Python\Python38
> (b) C:\Python38
> (c) C:\Program Files\Python38
> Issue only happens on (a) and (c).
> (a) happen on <UserName> have whitespace. Ex: Tony Chen
> (c) happen on "Program Files" have whitespace.
> 
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Signed-off-by: IanX Kuo <ianx.kuo@intel.com>
> ---
>  .../Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py            | 6 +++---
>  .../MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py     | 6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddres
> s.py
> b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddres
> s.py
> index 406e5ec130..f3cba2651a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddres
> s.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAd
> +++ dress.py
> @@ -1,6 +1,6 @@
>  ## @ RebaseAndPatchFspBinBaseAddress.py #-# Copyright (c) 2017 - 2019, Intel
> Corporation. All rights reserved.<BR>+# Copyright (c) 2017 - 2021, Intel
> Corporation. All rights reserved.<BR> # SPDX-License-Identifier: BSD-2-Clause-
> Patent # @@ -93,13 +93,13 @@ fspTBaseAddress = flashBase + fspTBaseOffset
> # Re-base FSP bin file to new address and save it as fspBinFileRebased using
> SplitFspBin.py # rebaseArguments = fspBinFilePath + " -c s m t -b " +
> str(hex(fspSBaseAddress).rstrip("L")) + " " + str(hex(fspMBaseAddress).rstrip("L"))
> + " " + str(hex(fspTBaseAddress).rstrip("L")) + " -o" + fspBinPath + " -n " +
> fspBinFileRebased-os.system(pythontool + " " + splitFspBinPath + " rebase -f" +
> rebaseArguments)+os.system('"' + pythontool + '"' + " " + splitFspBinPath + "
> rebase -f" + rebaseArguments)  # # Split FSP bin to FSP-S/M/T segments #
> splitArguments = fspBinPath + os.sep + fspBinFileRebased + " -o " + fspBinPath +
> " -n Fsp_Rebased.fd"-os.system(pythontool + " " + splitFspBinPath + " split -f" +
> splitArguments)+os.system('"' + pythontool + '"' + " " + splitFspBinPath + " split -
> f" + splitArguments)  # # Patch dsc file with the re-based FSP-S/M/T address, so
> internally build will use the same.diff --git
> a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py
> b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py
> index fb4cf4f9b7..b7e4bcf5f9 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py
> @@ -1,6 +1,6 @@
>  ## @ RebaseFspBinBaseAddress.py #-# Copyright (c) 2019, Intel Corporation. All
> rights reserved.<BR>+# Copyright (c) 2019 - 2021, Intel Corporation. All rights
> reserved.<BR> # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -87,12
> +87,12 @@ fspTBaseAddress = flashBase + fspTBaseOffset  # Re-base FSP bin
> file to new address and save it as fspBinFileRebased using SplitFspBin.py #
> rebaseArguments = fspBinFilePath + " -c s m t -b " +
> str(hex(fspSBaseAddress).rstrip("L")) + " " + str(hex(fspMBaseAddress).rstrip("L"))
> + " " + str(hex(fspTBaseAddress).rstrip("L")) + " -o" + fspBinPath + " -n " +
> fspBinFileRebased-os.system(pythontool + " " + splitFspBinPath + " rebase -f" +
> rebaseArguments)+os.system('"' + pythontool + '"' + " " + splitFspBinPath + "
> rebase -f" + rebaseArguments)  # # Split FSP bin to FSP-S/M/T segments #
> splitArguments = fspBinPath + os.sep + fspBinFileRebased + " -o " + fspBinPath +
> " -n Fsp_Rebased.fd"-os.system(pythontool + " " + splitFspBinPath + " split -f" +
> splitArguments)+os.system('"' + pythontool + '"' + " " + splitFspBinPath + " split -
> f" + splitArguments)  exit(0)--
> 2.27.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#75505): https://edk2.groups.io/g/devel/message/75505
Mute This Topic: https://groups.io/mt/83047301/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [PATCH v4] MinPlatformPkg: Rebase fail when python tools path exist whitespace exist whitespace REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3412
Posted by Chiu, Chasel 2 years, 11 months ago 
Patch has pushed: 86984c17d562fc60a6dabbc3a479d79163656a0c

> -----Original Message-----
> From: Kuo, IanX <ianx.kuo@intel.com>
> Sent: Monday, May 24, 2021 6:49 AM
> To: devel@edk2.groups.io
> Cc: Kuo, IanX <ianx.kuo@intel.com>; Chiu, Chasel <chasel.chiu@intel.com>;
> Desimone, Nathaniel L <nathaniel.l.desimone@intel.com>
> Subject: [PATCH v4] MinPlatformPkg: Rebase fail when python tools path exist
> whitespace exist whitespace REF:
> https://bugzilla.tianocore.org/show_bug.cgi?id=3412
> 
> From: IanX Kuo <ianx.kuo@intel.com>
> 
> (a) C:\Users\<UserName>\AppData\Local\Program\Python\Python38
> (b) C:\Python38
> (c) C:\Program Files\Python38
> Issue only happens on (a) and (c).
> (a) happen on <UserName> have whitespace. Ex: Tony Chen
> (c) happen on "Program Files" have whitespace.
> 
> Reviewed-by: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Chasel Chiu <chasel.chiu@intel.com>
> Cc: Nate DeSimone <nathaniel.l.desimone@intel.com>
> Signed-off-by: IanX Kuo <ianx.kuo@intel.com>
> ---
>  .../Tools/Fsp/RebaseAndPatchFspBinBaseAddress.py            | 6 +++---
>  .../MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py     | 6 +++---
>  2 files changed, 6 insertions(+), 6 deletions(-)
> 
> diff --git
> a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddres
> s.py
> b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddres
> s.py
> index 406e5ec130..f3cba2651a 100644
> ---
> a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAddres
> s.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseAndPatchFspBinBaseAd
> +++ dress.py
> @@ -1,6 +1,6 @@
>  ## @ RebaseAndPatchFspBinBaseAddress.py #-# Copyright (c) 2017 - 2019, Intel
> Corporation. All rights reserved.<BR>+# Copyright (c) 2017 - 2021, Intel
> Corporation. All rights reserved.<BR> # SPDX-License-Identifier: BSD-2-Clause-
> Patent # @@ -93,13 +93,13 @@ fspTBaseAddress = flashBase + fspTBaseOffset
> # Re-base FSP bin file to new address and save it as fspBinFileRebased using
> SplitFspBin.py # rebaseArguments = fspBinFilePath + " -c s m t -b " +
> str(hex(fspSBaseAddress).rstrip("L")) + " " + str(hex(fspMBaseAddress).rstrip("L"))
> + " " + str(hex(fspTBaseAddress).rstrip("L")) + " -o" + fspBinPath + " -n " +
> fspBinFileRebased-os.system(pythontool + " " + splitFspBinPath + " rebase -f" +
> rebaseArguments)+os.system('"' + pythontool + '"' + " " + splitFspBinPath + "
> rebase -f" + rebaseArguments)  # # Split FSP bin to FSP-S/M/T segments #
> splitArguments = fspBinPath + os.sep + fspBinFileRebased + " -o " + fspBinPath +
> " -n Fsp_Rebased.fd"-os.system(pythontool + " " + splitFspBinPath + " split -f" +
> splitArguments)+os.system('"' + pythontool + '"' + " " + splitFspBinPath + " split -
> f" + splitArguments)  # # Patch dsc file with the re-based FSP-S/M/T address, so
> internally build will use the same.diff --git
> a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py
> b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py
> index fb4cf4f9b7..b7e4bcf5f9 100644
> --- a/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py
> +++ b/Platform/Intel/MinPlatformPkg/Tools/Fsp/RebaseFspBinBaseAddress.py
> @@ -1,6 +1,6 @@
>  ## @ RebaseFspBinBaseAddress.py #-# Copyright (c) 2019, Intel Corporation. All
> rights reserved.<BR>+# Copyright (c) 2019 - 2021, Intel Corporation. All rights
> reserved.<BR> # SPDX-License-Identifier: BSD-2-Clause-Patent # @@ -87,12
> +87,12 @@ fspTBaseAddress = flashBase + fspTBaseOffset  # Re-base FSP bin
> file to new address and save it as fspBinFileRebased using SplitFspBin.py #
> rebaseArguments = fspBinFilePath + " -c s m t -b " +
> str(hex(fspSBaseAddress).rstrip("L")) + " " + str(hex(fspMBaseAddress).rstrip("L"))
> + " " + str(hex(fspTBaseAddress).rstrip("L")) + " -o" + fspBinPath + " -n " +
> fspBinFileRebased-os.system(pythontool + " " + splitFspBinPath + " rebase -f" +
> rebaseArguments)+os.system('"' + pythontool + '"' + " " + splitFspBinPath + "
> rebase -f" + rebaseArguments)  # # Split FSP bin to FSP-S/M/T segments #
> splitArguments = fspBinPath + os.sep + fspBinFileRebased + " -o " + fspBinPath +
> " -n Fsp_Rebased.fd"-os.system(pythontool + " " + splitFspBinPath + " split -f" +
> splitArguments)+os.system('"' + pythontool + '"' + " " + splitFspBinPath + " split -
> f" + splitArguments)  exit(0)--
> 2.27.0.windows.1



-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#75862): https://edk2.groups.io/g/devel/message/75862
Mute This Topic: https://groups.io/mt/83202359/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.