From: "Gao, Liming" <liming.gao@intel.com>
To: Laszlo Ersek <lersek@redhat.com>,
edk2-devel-01 <edk2-devel@lists.01.org>
Subject: Re: [PATCH] BaseTools/PosixLike: honor pre-set PYTHONPATH
Date: Wed, 21 Mar 2018 02:22:37 +0000 [thread overview]
Message-ID: <4A89E2EF3DFEDB4C8BFDE51014F606A14E1EA9BC@SHSMSX104.ccr.corp.intel.com> (raw)
In-Reply-To: <20180314105423.27682-1-lersek@redhat.com>
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
next prev parent reply other threads:[~2018-03-21 2:16 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-03-14 10:54 [PATCH] BaseTools/PosixLike: honor pre-set PYTHONPATH Laszlo Ersek
2018-03-20 15:28 ` Laszlo Ersek
2018-03-21 2:22 ` Gao, Liming [this message]
2018-03-21 14:56 ` Laszlo Ersek
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=4A89E2EF3DFEDB4C8BFDE51014F606A14E1EA9BC@SHSMSX104.ccr.corp.intel.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox