1. Patchew
  2. EDK2
  3. View series

[edk2] [PATCH] BaseTools/PosixLike: honor pre-set PYTHONPATH

Laszlo Ersek posted 1 patch 6 years, 1 month ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/edk2 tags/patchew/20180314105423.27682-1-lersek@redhat.com
BaseTools/BinWrappers/PosixLike/BPDG                      | 2 +-
BaseTools/BinWrappers/PosixLike/Ecc                       | 2 +-
BaseTools/BinWrappers/PosixLike/GenDepex                  | 2 +-
BaseTools/BinWrappers/PosixLike/GenFds                    | 2 +-
BaseTools/BinWrappers/PosixLike/GenPatchPcdTable          | 2 +-
BaseTools/BinWrappers/PosixLike/PatchPcdValue             | 2 +-
BaseTools/BinWrappers/PosixLike/Pkcs7Sign                 | 2 +-
BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys | 2 +-
BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign         | 2 +-
BaseTools/BinWrappers/PosixLike/TargetTool                | 2 +-
BaseTools/BinWrappers/PosixLike/Trim                      | 2 +-
BaseTools/BinWrappers/PosixLike/UPT                       | 2 +-
BaseTools/BinWrappers/PosixLike/build                     | 2 +-
13 files changed, 13 insertions(+), 13 deletions(-)
[edk2] [PATCH] BaseTools/PosixLike: honor pre-set PYTHONPATH
Posted by Laszlo Ersek 6 years, 1 month ago 
Utilities written in Python may depend on external (preinstalled) Python
packages; for example, Ecc depends on "antlr_python_runtime-3.0.1". Such
packages need not be installed system-wide, as long as they are reachable
through PYTHONPATH. Therefore we shouldn't overwrite the user's PYTHONPATH
with "BaseTools/Source/Python"; instead, we should prepend the latter to
the former.

Cc: Liming Gao <liming.gao@intel.com>
Cc: Yonghong Zhu <yonghong.zhu@intel.com>
Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=896
Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Laszlo Ersek <lersek@redhat.com>
---

Notes:
    Repo:   https://github.com/lersek/edk2.git
    Branch: pythonpath

 BaseTools/BinWrappers/PosixLike/BPDG                      | 2 +-
 BaseTools/BinWrappers/PosixLike/Ecc                       | 2 +-
 BaseTools/BinWrappers/PosixLike/GenDepex                  | 2 +-
 BaseTools/BinWrappers/PosixLike/GenFds                    | 2 +-
 BaseTools/BinWrappers/PosixLike/GenPatchPcdTable          | 2 +-
 BaseTools/BinWrappers/PosixLike/PatchPcdValue             | 2 +-
 BaseTools/BinWrappers/PosixLike/Pkcs7Sign                 | 2 +-
 BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys | 2 +-
 BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign         | 2 +-
 BaseTools/BinWrappers/PosixLike/TargetTool                | 2 +-
 BaseTools/BinWrappers/PosixLike/Trim                      | 2 +-
 BaseTools/BinWrappers/PosixLike/UPT                       | 2 +-
 BaseTools/BinWrappers/PosixLike/build                     | 2 +-
 13 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/BaseTools/BinWrappers/PosixLike/BPDG b/BaseTools/BinWrappers/PosixLike/BPDG
index 214d88fff1b1..01ae23ddeb4f 100755
--- a/BaseTools/BinWrappers/PosixLike/BPDG
+++ b/BaseTools/BinWrappers/PosixLike/BPDG
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
 dir=$(dirname "$full_cmd")
 cmd=${full_cmd##*/}
 
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
 exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
diff --git a/BaseTools/BinWrappers/PosixLike/Ecc b/BaseTools/BinWrappers/PosixLike/Ecc
index 214d88fff1b1..01ae23ddeb4f 100755
--- a/BaseTools/BinWrappers/PosixLike/Ecc
+++ b/BaseTools/BinWrappers/PosixLike/Ecc
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
 dir=$(dirname "$full_cmd")
 cmd=${full_cmd##*/}
 
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
 exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
diff --git a/BaseTools/BinWrappers/PosixLike/GenDepex b/BaseTools/BinWrappers/PosixLike/GenDepex
index bdb6722a1f84..dad174788bc3 100755
--- a/BaseTools/BinWrappers/PosixLike/GenDepex
+++ b/BaseTools/BinWrappers/PosixLike/GenDepex
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
 dir=$(dirname "$full_cmd")
 cmd=${full_cmd##*/}
 
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
 exec "${python_exe:-python}" "$dir/../../Source/Python/AutoGen/$cmd.py" "$@"
diff --git a/BaseTools/BinWrappers/PosixLike/GenFds b/BaseTools/BinWrappers/PosixLike/GenFds
index 214d88fff1b1..01ae23ddeb4f 100755
--- a/BaseTools/BinWrappers/PosixLike/GenFds
+++ b/BaseTools/BinWrappers/PosixLike/GenFds
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
 dir=$(dirname "$full_cmd")
 cmd=${full_cmd##*/}
 
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
 exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
diff --git a/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable b/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
index 214d88fff1b1..01ae23ddeb4f 100755
--- a/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
+++ b/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
 dir=$(dirname "$full_cmd")
 cmd=${full_cmd##*/}
 
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
 exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
diff --git a/BaseTools/BinWrappers/PosixLike/PatchPcdValue b/BaseTools/BinWrappers/PosixLike/PatchPcdValue
index 214d88fff1b1..01ae23ddeb4f 100755
--- a/BaseTools/BinWrappers/PosixLike/PatchPcdValue
+++ b/BaseTools/BinWrappers/PosixLike/PatchPcdValue
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
 dir=$(dirname "$full_cmd")
 cmd=${full_cmd##*/}
 
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
 exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
diff --git a/BaseTools/BinWrappers/PosixLike/Pkcs7Sign b/BaseTools/BinWrappers/PosixLike/Pkcs7Sign
index 214d88fff1b1..01ae23ddeb4f 100755
--- a/BaseTools/BinWrappers/PosixLike/Pkcs7Sign
+++ b/BaseTools/BinWrappers/PosixLike/Pkcs7Sign
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
 dir=$(dirname "$full_cmd")
 cmd=${full_cmd##*/}
 
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
 exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
diff --git a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
index 2cddde9d4f0b..1bc1054a3452 100755
--- a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
+++ b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
 dir=$(dirname "$full_cmd")
 cmd=${full_cmd##*/}
 
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
 exec "${python_exe:-python}" "$dir/../../Source/Python/Rsa2048Sha256Sign/$cmd.py" "$@"
diff --git a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign
index 214d88fff1b1..01ae23ddeb4f 100755
--- a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign
+++ b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
 dir=$(dirname "$full_cmd")
 cmd=${full_cmd##*/}
 
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
 exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
diff --git a/BaseTools/BinWrappers/PosixLike/TargetTool b/BaseTools/BinWrappers/PosixLike/TargetTool
index 214d88fff1b1..01ae23ddeb4f 100755
--- a/BaseTools/BinWrappers/PosixLike/TargetTool
+++ b/BaseTools/BinWrappers/PosixLike/TargetTool
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
 dir=$(dirname "$full_cmd")
 cmd=${full_cmd##*/}
 
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
 exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
diff --git a/BaseTools/BinWrappers/PosixLike/Trim b/BaseTools/BinWrappers/PosixLike/Trim
index 7cac4f7c4fff..6c8dde5bec3e 100755
--- a/BaseTools/BinWrappers/PosixLike/Trim
+++ b/BaseTools/BinWrappers/PosixLike/Trim
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
 dir=$(dirname "$full_cmd")
 exe=$(basename "$full_cmd")
 
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
 exec "${python_exe:-python}" "$dir/../../Source/Python/$exe/$exe.py" "$@"
diff --git a/BaseTools/BinWrappers/PosixLike/UPT b/BaseTools/BinWrappers/PosixLike/UPT
index 214d88fff1b1..01ae23ddeb4f 100755
--- a/BaseTools/BinWrappers/PosixLike/UPT
+++ b/BaseTools/BinWrappers/PosixLike/UPT
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
 dir=$(dirname "$full_cmd")
 cmd=${full_cmd##*/}
 
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
 exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
diff --git a/BaseTools/BinWrappers/PosixLike/build b/BaseTools/BinWrappers/PosixLike/build
index 214d88fff1b1..01ae23ddeb4f 100755
--- a/BaseTools/BinWrappers/PosixLike/build
+++ b/BaseTools/BinWrappers/PosixLike/build
@@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
 dir=$(dirname "$full_cmd")
 cmd=${full_cmd##*/}
 
-export PYTHONPATH="$dir/../../Source/Python"
+export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
 exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
-- 
2.14.1.3.gb7cf6e02401b

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] BaseTools/PosixLike: honor pre-set PYTHONPATH
Posted by Laszlo Ersek 6 years, 1 month ago 
Hello Liming, Yonghong,

On 03/14/18 11:54, Laszlo Ersek wrote:
> Utilities written in Python may depend on external (preinstalled) Python
> packages; for example, Ecc depends on "antlr_python_runtime-3.0.1". Such
> packages need not be installed system-wide, as long as they are reachable
> through PYTHONPATH. Therefore we shouldn't overwrite the user's PYTHONPATH
> with "BaseTools/Source/Python"; instead, we should prepend the latter to
> the former.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=896
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
> 
> Notes:
>     Repo:   https://github.com/lersek/edk2.git
>     Branch: pythonpath

Ping -- looks like this patch was missed; can you guys please review it?

Thanks,
Laszlo

>  BaseTools/BinWrappers/PosixLike/BPDG                      | 2 +-
>  BaseTools/BinWrappers/PosixLike/Ecc                       | 2 +-
>  BaseTools/BinWrappers/PosixLike/GenDepex                  | 2 +-
>  BaseTools/BinWrappers/PosixLike/GenFds                    | 2 +-
>  BaseTools/BinWrappers/PosixLike/GenPatchPcdTable          | 2 +-
>  BaseTools/BinWrappers/PosixLike/PatchPcdValue             | 2 +-
>  BaseTools/BinWrappers/PosixLike/Pkcs7Sign                 | 2 +-
>  BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys | 2 +-
>  BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign         | 2 +-
>  BaseTools/BinWrappers/PosixLike/TargetTool                | 2 +-
>  BaseTools/BinWrappers/PosixLike/Trim                      | 2 +-
>  BaseTools/BinWrappers/PosixLike/UPT                       | 2 +-
>  BaseTools/BinWrappers/PosixLike/build                     | 2 +-
>  13 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/BaseTools/BinWrappers/PosixLike/BPDG b/BaseTools/BinWrappers/PosixLike/BPDG
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/BPDG
> +++ b/BaseTools/BinWrappers/PosixLike/BPDG
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
>  
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/Ecc b/BaseTools/BinWrappers/PosixLike/Ecc
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/Ecc
> +++ b/BaseTools/BinWrappers/PosixLike/Ecc
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
>  
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/GenDepex b/BaseTools/BinWrappers/PosixLike/GenDepex
> index bdb6722a1f84..dad174788bc3 100755
> --- a/BaseTools/BinWrappers/PosixLike/GenDepex
> +++ b/BaseTools/BinWrappers/PosixLike/GenDepex
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
>  
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/AutoGen/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/GenFds b/BaseTools/BinWrappers/PosixLike/GenFds
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/GenFds
> +++ b/BaseTools/BinWrappers/PosixLike/GenFds
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
>  
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable b/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
> +++ b/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
>  
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/PatchPcdValue b/BaseTools/BinWrappers/PosixLike/PatchPcdValue
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/PatchPcdValue
> +++ b/BaseTools/BinWrappers/PosixLike/PatchPcdValue
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
>  
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/Pkcs7Sign b/BaseTools/BinWrappers/PosixLike/Pkcs7Sign
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/Pkcs7Sign
> +++ b/BaseTools/BinWrappers/PosixLike/Pkcs7Sign
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
>  
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
> index 2cddde9d4f0b..1bc1054a3452 100755
> --- a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
> +++ b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
>  
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/Rsa2048Sha256Sign/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign
> +++ b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
>  
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/TargetTool b/BaseTools/BinWrappers/PosixLike/TargetTool
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/TargetTool
> +++ b/BaseTools/BinWrappers/PosixLike/TargetTool
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
>  
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/Trim b/BaseTools/BinWrappers/PosixLike/Trim
> index 7cac4f7c4fff..6c8dde5bec3e 100755
> --- a/BaseTools/BinWrappers/PosixLike/Trim
> +++ b/BaseTools/BinWrappers/PosixLike/Trim
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  exe=$(basename "$full_cmd")
>  
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$exe/$exe.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/UPT b/BaseTools/BinWrappers/PosixLike/UPT
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/UPT
> +++ b/BaseTools/BinWrappers/PosixLike/UPT
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
>  
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/build b/BaseTools/BinWrappers/PosixLike/build
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/build
> +++ b/BaseTools/BinWrappers/PosixLike/build
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
>  
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> 

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] BaseTools/PosixLike: honor pre-set PYTHONPATH
Posted by Gao, Liming 6 years, 1 month ago 
The change is good. 

Reviewed-by: Liming Gao <liming.gao@intel.com>

> -----Original Message-----
> From: Laszlo Ersek [mailto:lersek@redhat.com]
> Sent: Wednesday, March 14, 2018 6:54 PM
> To: edk2-devel-01 <edk2-devel@lists.01.org>
> Cc: Gao, Liming <liming.gao@intel.com>; Zhu, Yonghong <yonghong.zhu@intel.com>
> Subject: [PATCH] BaseTools/PosixLike: honor pre-set PYTHONPATH
> 
> Utilities written in Python may depend on external (preinstalled) Python
> packages; for example, Ecc depends on "antlr_python_runtime-3.0.1". Such
> packages need not be installed system-wide, as long as they are reachable
> through PYTHONPATH. Therefore we shouldn't overwrite the user's PYTHONPATH
> with "BaseTools/Source/Python"; instead, we should prepend the latter to
> the former.
> 
> Cc: Liming Gao <liming.gao@intel.com>
> Cc: Yonghong Zhu <yonghong.zhu@intel.com>
> Ref: https://bugzilla.tianocore.org/show_bug.cgi?id=896
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Laszlo Ersek <lersek@redhat.com>
> ---
> 
> Notes:
>     Repo:   https://github.com/lersek/edk2.git
>     Branch: pythonpath
> 
>  BaseTools/BinWrappers/PosixLike/BPDG                      | 2 +-
>  BaseTools/BinWrappers/PosixLike/Ecc                       | 2 +-
>  BaseTools/BinWrappers/PosixLike/GenDepex                  | 2 +-
>  BaseTools/BinWrappers/PosixLike/GenFds                    | 2 +-
>  BaseTools/BinWrappers/PosixLike/GenPatchPcdTable          | 2 +-
>  BaseTools/BinWrappers/PosixLike/PatchPcdValue             | 2 +-
>  BaseTools/BinWrappers/PosixLike/Pkcs7Sign                 | 2 +-
>  BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys | 2 +-
>  BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign         | 2 +-
>  BaseTools/BinWrappers/PosixLike/TargetTool                | 2 +-
>  BaseTools/BinWrappers/PosixLike/Trim                      | 2 +-
>  BaseTools/BinWrappers/PosixLike/UPT                       | 2 +-
>  BaseTools/BinWrappers/PosixLike/build                     | 2 +-
>  13 files changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/BaseTools/BinWrappers/PosixLike/BPDG b/BaseTools/BinWrappers/PosixLike/BPDG
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/BPDG
> +++ b/BaseTools/BinWrappers/PosixLike/BPDG
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
> 
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/Ecc b/BaseTools/BinWrappers/PosixLike/Ecc
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/Ecc
> +++ b/BaseTools/BinWrappers/PosixLike/Ecc
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
> 
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/GenDepex b/BaseTools/BinWrappers/PosixLike/GenDepex
> index bdb6722a1f84..dad174788bc3 100755
> --- a/BaseTools/BinWrappers/PosixLike/GenDepex
> +++ b/BaseTools/BinWrappers/PosixLike/GenDepex
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
> 
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/AutoGen/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/GenFds b/BaseTools/BinWrappers/PosixLike/GenFds
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/GenFds
> +++ b/BaseTools/BinWrappers/PosixLike/GenFds
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
> 
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable b/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
> +++ b/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
> 
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/PatchPcdValue b/BaseTools/BinWrappers/PosixLike/PatchPcdValue
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/PatchPcdValue
> +++ b/BaseTools/BinWrappers/PosixLike/PatchPcdValue
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
> 
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/Pkcs7Sign b/BaseTools/BinWrappers/PosixLike/Pkcs7Sign
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/Pkcs7Sign
> +++ b/BaseTools/BinWrappers/PosixLike/Pkcs7Sign
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
> 
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
> b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
> index 2cddde9d4f0b..1bc1054a3452 100755
> --- a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
> +++ b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256GenerateKeys
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
> 
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/Rsa2048Sha256Sign/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign
> +++ b/BaseTools/BinWrappers/PosixLike/Rsa2048Sha256Sign
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
> 
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/TargetTool b/BaseTools/BinWrappers/PosixLike/TargetTool
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/TargetTool
> +++ b/BaseTools/BinWrappers/PosixLike/TargetTool
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
> 
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/Trim b/BaseTools/BinWrappers/PosixLike/Trim
> index 7cac4f7c4fff..6c8dde5bec3e 100755
> --- a/BaseTools/BinWrappers/PosixLike/Trim
> +++ b/BaseTools/BinWrappers/PosixLike/Trim
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  exe=$(basename "$full_cmd")
> 
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$exe/$exe.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/UPT b/BaseTools/BinWrappers/PosixLike/UPT
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/UPT
> +++ b/BaseTools/BinWrappers/PosixLike/UPT
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
> 
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> diff --git a/BaseTools/BinWrappers/PosixLike/build b/BaseTools/BinWrappers/PosixLike/build
> index 214d88fff1b1..01ae23ddeb4f 100755
> --- a/BaseTools/BinWrappers/PosixLike/build
> +++ b/BaseTools/BinWrappers/PosixLike/build
> @@ -10,5 +10,5 @@ full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for a d
>  dir=$(dirname "$full_cmd")
>  cmd=${full_cmd##*/}
> 
> -export PYTHONPATH="$dir/../../Source/Python"
> +export PYTHONPATH="$dir/../../Source/Python${PYTHONPATH:+:"$PYTHONPATH"}"
>  exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@"
> --
> 2.14.1.3.gb7cf6e02401b

_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
Re: [edk2] [PATCH] BaseTools/PosixLike: honor pre-set PYTHONPATH
Posted by Laszlo Ersek 6 years ago 
On 03/21/18 03:22, Gao, Liming wrote:
> The change is good. 
> 
> Reviewed-by: Liming Gao <liming.gao@intel.com>

Thank you, Liming; commit b12b2c74a3fb.

Laszlo
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.