回复: [edk2-devel] 回复: [PATCH] BaseTools: Fix BrotliCompress run issue on Linux

[gaoliming]

Yunhua:
  Please also fix it in
edk2\BaseTools\BinPipWrappers\PosixLike\BrotliCompress.

Thanks
Liming
> -----邮件原件-----
> 发件人: bounce+27952+71273+4905953+8761045 at groups.io
> <bounce+27952+71273+4905953+8761045 at groups.io> 代表 gaoliming
> 发送时间: 2021年2月5日 9:13
> 收件人: 'Yunhua Feng' <fengyunhua at byosoft.com.cn>;
> devel at edk2.groups.io
> 抄送: 'Bob Feng' <bob.c.feng at intel.com>; 'Yuwei Chen'
> <yuwei.chen at intel.com>
> 主题: [edk2-devel] 回复: [PATCH] BaseTools: Fix BrotliCompress run issue
on
> Linux
> 
> Reviewed-by: Liming Gao <gaoliming at byosoft.com.cn>
> 
> > -----邮件原件-----
> > 发件人: Yunhua Feng <fengyunhua at byosoft.com.cn>
> > 发送时间: 2021年2月4日 16:54
> > 收件人: devel at edk2.groups.io
> > 抄送: Bob Feng <bob.c.feng at intel.com>; Liming Gao
> > <gaoliming at byosoft.com.cn>; Yuwei Chen <yuwei.chen at intel.com>
> > 主题: [PATCH] BaseTools: Fix BrotliCompress run issue on Linux
> >
> > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3210
> > BrotliCompress changed, but not completely on Linux
> >
> > Cc: Bob Feng <bob.c.feng at intel.com>
> > Cc: Liming Gao <gaoliming at byosoft.com.cn>
> > Cc: Yuwei Chen <yuwei.chen at intel.com>
> > Signed-off-by: Yunhua Feng <fengyunhua at byosoft.com.cn>
> > ---
> >  BaseTools/BinWrappers/PosixLike/Brotli        | 29 -------------------
> >  .../BinWrappers/PosixLike/BrotliCompress      | 28
> +++++++++++++++++-
> >  2 files changed, 27 insertions(+), 30 deletions(-)
> >  delete mode 100755 BaseTools/BinWrappers/PosixLike/Brotli
> >
> > diff --git a/BaseTools/BinWrappers/PosixLike/Brotli
> > b/BaseTools/BinWrappers/PosixLike/Brotli
> > deleted file mode 100755
> > index 0945d86d92..0000000000
> > --- a/BaseTools/BinWrappers/PosixLike/Brotli
> > +++ /dev/null
> > @@ -1,29 +0,0 @@
> > -#!/usr/bin/env bash
> > -
> > -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##*/}
> > -
> > -if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> > -then
> > -  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> > -elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> > -then
> > -  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> > -  then
> > -    echo "BaseTools C Tool binary was not found ($cmd)"
> > -    echo "You may need to run:"
> > -    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> > -  else
> > -    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" "$@"
> > -  fi
> > -elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> > -then
> > -  exec "$dir/../../Source/C/bin/$cmd" "$@"
> > -else
> > -  echo "Unable to find the real '$cmd' to run"
> > -  echo "This message was printed by"
> > -  echo "  $0"
> > -  exit 127
> > -fi
> > -
> > diff --git a/BaseTools/BinWrappers/PosixLike/BrotliCompress
> > b/BaseTools/BinWrappers/PosixLike/BrotliCompress
> > index 663860bb3e..426f2a2ef1 100755
> > --- a/BaseTools/BinWrappers/PosixLike/BrotliCompress
> > +++ b/BaseTools/BinWrappers/PosixLike/BrotliCompress
> > @@ -8,6 +8,10 @@
> >  QLT="-q 9 -w 22"
> >  ARGS=
> >
> > +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##*/}
> > +
> >  while test $# -gt 0
> >  do
> >    case $1 in
> > @@ -31,4 +35,26 @@ do
> >    shift
> >  done
> >
> > -exec Brotli $QLT $ARGS
> > +
> > +if [ -n "$WORKSPACE" ] && [ -e "$WORKSPACE/Conf/BaseToolsCBinaries" ]
> > +then
> > +  exec "$WORKSPACE/Conf/BaseToolsCBinaries/$cmd"
> > +elif [ -n "$WORKSPACE" ] && [ -e "$EDK_TOOLS_PATH/Source/C" ]
> > +then
> > +  if [ ! -e "$EDK_TOOLS_PATH/Source/C/bin/$cmd" ]
> > +  then
> > +    echo "BaseTools C Tool binary was not found ($cmd)"
> > +    echo "You may need to run:"
> > +    echo "  make -C $EDK_TOOLS_PATH/Source/C"
> > +  else
> > +    exec "$EDK_TOOLS_PATH/Source/C/bin/$cmd" $QLT $ARGS
> > +  fi
> > +elif [ -e "$dir/../../Source/C/bin/$cmd" ]
> > +then
> > +  exec "$dir/../../Source/C/bin/$cmd" $QLT $ARGS
> > +else
> > +  echo "Unable to find the real '$cmd' to run"
> > +  echo "This message was printed by"
> > +  echo "  $0"
> > +  exit 127
> > +fi
> > --
> > 2.27.0.windows.1
> 
> 
> 
> 
> 
> 
> 





-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#71759): https://edk2.groups.io/g/devel/message/71759
Mute This Topic: https://groups.io/mt/80720365/1813853
Group Owner: devel+owner at edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [edk2-devel-archive at redhat.com]
-=-=-=-=-=-=-=-=-=-=-=-