From mboxrd@z Thu Jan  1 00:00:00 1970
Received: from mail.byosoft.com.cn (mail.byosoft.com.cn [58.240.74.242])
 by mx.groups.io with SMTP id smtpd.web12.1895.1612487610886672151
 for <devel@edk2.groups.io>;
 Thu, 04 Feb 2021 17:13:32 -0800
Authentication-Results: mx.groups.io;
 dkim=missing; spf=none, err=permanent DNS error (domain: byosoft.com.cn, ip: 58.240.74.242, mailfrom: gaoliming@byosoft.com.cn)
Received: from DESKTOPS6D0PVI ([58.246.60.130])
	(envelope-sender <gaoliming@byosoft.com.cn>)
	by 192.168.6.13 with ESMTP
	for <bob.c.feng@intel.com>; Fri, 05 Feb 2021 09:13:17 +0800
X-WM-Sender: gaoliming@byosoft.com.cn
X-WM-AuthFlag: YES
X-WM-AuthUser: gaoliming@byosoft.com.cn
From: "gaoliming" <gaoliming@byosoft.com.cn>
To: "'Yunhua Feng'" <fengyunhua@byosoft.com.cn>,
	<devel@edk2.groups.io>
Cc: "'Bob Feng'" <bob.c.feng@intel.com>,
	"'Yuwei Chen'" <yuwei.chen@intel.com>
References: <20210204085342.1223-1-fengyunhua@byosoft.com.cn>
In-Reply-To: <20210204085342.1223-1-fengyunhua@byosoft.com.cn>
Subject: =?UTF-8?B?5Zue5aSNOiBbUEFUQ0hdIEJhc2VUb29sczogRml4IEJyb3RsaUNvbXByZXNzIHJ1biBpc3N1ZSBvbiBMaW51eA==?=
Date: Fri, 5 Feb 2021 09:13:25 +0800
Message-ID: <001801d6fb5c$1b125e80$51371b80$@byosoft.com.cn>
MIME-Version: 1.0
X-Mailer: Microsoft Outlook 16.0
Thread-Index: AQDGjP2RbygM6OgQDf5lSYIfNL/jKaxpniVQ
Content-Type: text/plain;
	charset="gb2312"
Content-Transfer-Encoding: quoted-printable
Content-Language: zh-cn

Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>

> -----=D3=CA=BC=FE=D4=AD=BC=FE-----
> =B7=A2=BC=FE=C8=CB: Yunhua Feng <fengyunhua@byosoft.com.cn>
> =B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA2=D4=C24=C8=D5 16:54
> =CA=D5=BC=FE=C8=CB: devel@edk2.groups.io
> =B3=AD=CB=CD: Bob Feng <bob.c.feng@intel.com>; Liming Gao
> <gaoliming@byosoft.com.cn>; Yuwei Chen <yuwei.chen@intel.com>
> =D6=F7=CC=E2: [PATCH] BaseTools: Fix BrotliCompress run issue on Linux
>=20
> REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3210
> BrotliCompress changed, but not completely on Linux
>=20
> Cc: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Signed-off-by: Yunhua Feng <fengyunhua@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
>=20
> 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=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is =
not a
> good choice here
> -dir=3D$(dirname "$full_cmd")
> -cmd=3D${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=3D"-q 9 -w 22"
>  ARGS=3D
>=20
> +full_cmd=3D${BASH_SOURCE:-$0} # see
> http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is =
not a
> good choice here
> +dir=3D$(dirname "$full_cmd")
> +cmd=3D${full_cmd##*/}
> +
>  while test $# -gt 0
>  do
>    case $1 in
> @@ -31,4 +35,26 @@ do
>    shift
>  done
>=20
> -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