On 2015-12-07 16:11:08, wrote: > From: Charles Duffy <[email protected]>
It looks like the author on the patches doesn't match the Signed-off-by below. Do you need to set user.name and user.email? https://git-scm.com/book/en/v2/Getting-Started-First-Time-Git-Setup Once you get those setup, you should be able to run $ git commit --amend --reset-author To fix the authorship on a commit. > > - Use `python2` executable if it exists, to avoid breakage on systems (such as > Arch Linux) where `python` is Python 3. > - Quote all references to `$0`, for safety when located in a directory > containing spaces in its name. > - Use the `exec` shell command to avoid leaving the shell wrapper in the > process table when invoking the actual build tool. > - Use `"$@"` rather than `$*` to pass arguments through directly rather than > concatenating to a string, and then string-splitting and glob-expanding its > contents. > - Use `$BASH_SOURCE` in preference to `$0` (which is only guaranteed to be > process name, *not* source path). Based on your bullet list, I think you might have 5 patches here. :) > You should probably Cc the maintainers listed in Maintainers.txt here. Then git send-email will add them as a Cc to the email. Feel free to add me as a Cc for these patches too. > Signed-off-by: Charles Duffy <[email protected]> Can you send your patches from the same address that you have here? > Contributed-under: TianoCore Contribution Agreement 1.0 I guess we normally put this above Signed-off-by. (See BaseTools/Contributions.txt) > --- > BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc | 13 +++++++++++-- > BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex | 15 +++++++++++++-- > BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds | 13 +++++++++++-- > BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool | 13 +++++++++++-- > BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim | 13 +++++++++++-- > BaseTools/Bin/CYGWIN_NT-5.1-i686/build | 13 +++++++++++-- > BaseTools/BinWrappers/PosixLike/BPDG | 13 +++++++++++-- > BaseTools/BinWrappers/PosixLike/Ecc | 13 +++++++++++-- > BaseTools/BinWrappers/PosixLike/GenDepex | 15 +++++++++++++-- > BaseTools/BinWrappers/PosixLike/GenFds | 13 +++++++++++-- > BaseTools/BinWrappers/PosixLike/GenPatchPcdTable | 13 +++++++++++-- > BaseTools/BinWrappers/PosixLike/PatchPcdValue | 13 +++++++++++-- > BaseTools/BinWrappers/PosixLike/TargetTool | 13 +++++++++++-- > BaseTools/BinWrappers/PosixLike/Trim | 13 +++++++++++-- > BaseTools/BinWrappers/PosixLike/UPT | 13 +++++++++++-- > BaseTools/BinWrappers/PosixLike/build | 13 +++++++++++-- Hmm: $ grep -l python BaseTools/BinWrappers/PosixLike/* showed a lot more files, but these are from old commented python invocations. Maybe you'd care to clean those up? :) > 16 files changed, 180 insertions(+), 32 deletions(-) > > diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc > b/BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc > index 2cb8b86..214d88f 100755 > --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc > +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/Ecc > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 Maybe else python_exe=python? > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here Maybe you can just add this info in the commit message rather than the comment? And, perhaps a summary of the concerns. -Jordan > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex > b/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex > index bd3141a..214d88f 100755 > --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex > +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenDepex > @@ -1,3 +1,14 @@ > #!/usr/bin/env bash > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/AutoGen/`basename $0`.py $* > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds > b/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds > index 2cb8b86..214d88f 100755 > --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds > +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/GenFds > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool > b/BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool > index 2cb8b86..214d88f 100755 > --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool > +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/TargetTool > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim > b/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim > index 2cb8b86..7cac4f7 100755 > --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim > +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/Trim > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +exe=$(basename "$full_cmd") > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$exe/$exe.py" "$@" > diff --git a/BaseTools/Bin/CYGWIN_NT-5.1-i686/build > b/BaseTools/Bin/CYGWIN_NT-5.1-i686/build > index 2cb8b86..214d88f 100755 > --- a/BaseTools/Bin/CYGWIN_NT-5.1-i686/build > +++ b/BaseTools/Bin/CYGWIN_NT-5.1-i686/build > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > diff --git a/BaseTools/BinWrappers/PosixLike/BPDG > b/BaseTools/BinWrappers/PosixLike/BPDG > index 2cb8b86..214d88f 100755 > --- a/BaseTools/BinWrappers/PosixLike/BPDG > +++ b/BaseTools/BinWrappers/PosixLike/BPDG > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > diff --git a/BaseTools/BinWrappers/PosixLike/Ecc > b/BaseTools/BinWrappers/PosixLike/Ecc > index 2cb8b86..214d88f 100755 > --- a/BaseTools/BinWrappers/PosixLike/Ecc > +++ b/BaseTools/BinWrappers/PosixLike/Ecc > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > diff --git a/BaseTools/BinWrappers/PosixLike/GenDepex > b/BaseTools/BinWrappers/PosixLike/GenDepex > index bd3141a..214d88f 100755 > --- a/BaseTools/BinWrappers/PosixLike/GenDepex > +++ b/BaseTools/BinWrappers/PosixLike/GenDepex > @@ -1,3 +1,14 @@ > #!/usr/bin/env bash > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/AutoGen/`basename $0`.py $* > +#python `dirname $0`/RunToolFromSource.py `basename $0` $* > + > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > diff --git a/BaseTools/BinWrappers/PosixLike/GenFds > b/BaseTools/BinWrappers/PosixLike/GenFds > index 2cb8b86..214d88f 100755 > --- a/BaseTools/BinWrappers/PosixLike/GenFds > +++ b/BaseTools/BinWrappers/PosixLike/GenFds > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > diff --git a/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable > b/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable > index 2cb8b86..214d88f 100755 > --- a/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable > +++ b/BaseTools/BinWrappers/PosixLike/GenPatchPcdTable > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > diff --git a/BaseTools/BinWrappers/PosixLike/PatchPcdValue > b/BaseTools/BinWrappers/PosixLike/PatchPcdValue > index 2cb8b86..214d88f 100755 > --- a/BaseTools/BinWrappers/PosixLike/PatchPcdValue > +++ b/BaseTools/BinWrappers/PosixLike/PatchPcdValue > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > diff --git a/BaseTools/BinWrappers/PosixLike/TargetTool > b/BaseTools/BinWrappers/PosixLike/TargetTool > index 2cb8b86..214d88f 100755 > --- a/BaseTools/BinWrappers/PosixLike/TargetTool > +++ b/BaseTools/BinWrappers/PosixLike/TargetTool > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > diff --git a/BaseTools/BinWrappers/PosixLike/Trim > b/BaseTools/BinWrappers/PosixLike/Trim > index 2cb8b86..7cac4f7 100755 > --- a/BaseTools/BinWrappers/PosixLike/Trim > +++ b/BaseTools/BinWrappers/PosixLike/Trim > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +exe=$(basename "$full_cmd") > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$exe/$exe.py" "$@" > diff --git a/BaseTools/BinWrappers/PosixLike/UPT > b/BaseTools/BinWrappers/PosixLike/UPT > index 2cb8b86..214d88f 100755 > --- a/BaseTools/BinWrappers/PosixLike/UPT > +++ b/BaseTools/BinWrappers/PosixLike/UPT > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > diff --git a/BaseTools/BinWrappers/PosixLike/build > b/BaseTools/BinWrappers/PosixLike/build > index 2cb8b86..214d88f 100755 > --- a/BaseTools/BinWrappers/PosixLike/build > +++ b/BaseTools/BinWrappers/PosixLike/build > @@ -1,5 +1,14 @@ > #!/usr/bin/env bash > #python `dirname $0`/RunToolFromSource.py `basename $0` $* > -PYTHONPATH="`dirname $0`/../../Source/Python" \ > - python "`dirname $0`/../../Source/Python"/`basename $0`/`basename $0`.py > $* > > +# If a python2 command is available, use it in preference to python > +if command -v python2 >/dev/null 2>&1; then > + python_exe=python2 > +fi > + > +full_cmd=${BASH_SOURCE:-$0} # see http://mywiki.wooledge.org/BashFAQ/028 for > a discussion of why $0 is not a good choice here > +dir=$(dirname "$full_cmd") > +cmd=${full_cmd##*/} > + > +export PYTHONPATH="$dir/../../Source/Python" > +exec "${python_exe:-python}" "$dir/../../Source/Python/$cmd/$cmd.py" "$@" > -- > 2.0.0 > > _______________________________________________ > edk2-devel mailing list > [email protected] > https://lists.01.org/mailman/listinfo/edk2-devel _______________________________________________ edk2-devel mailing list [email protected] https://lists.01.org/mailman/listinfo/edk2-devel
