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.web10.1126.1613612778245960950 for ; Wed, 17 Feb 2021 17:46:19 -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 ) by 192.168.6.13 with ESMTP for ; Thu, 18 Feb 2021 09:46:14 +0800 X-WM-Sender: gaoliming@byosoft.com.cn X-Originating-IP: 58.246.60.130 X-WM-AuthFlag: YES X-WM-AuthUser: gaoliming@byosoft.com.cn From: "gaoliming" To: , , "'Yunhua Feng'" Cc: "'Bob Feng'" , "'Yuwei Chen'" References: <20210204085342.1223-1-fengyunhua@byosoft.com.cn> <1660B4F0A1DF89A5.26096@groups.io> In-Reply-To: <1660B4F0A1DF89A5.26096@groups.io> Subject: =?UTF-8?B?5Zue5aSNOiBbZWRrMi1kZXZlbF0g5Zue5aSNOiBbUEFUQ0hdIEJhc2VUb29sczogRml4IEJyb3RsaUNvbXByZXNzIHJ1biBpc3N1ZSBvbiBMaW51eA==?= Date: Thu, 18 Feb 2021 09:46:18 +0800 Message-ID: <000201d70597$d9e62c20$8db28460$@byosoft.com.cn> MIME-Version: 1.0 X-Mailer: Microsoft Outlook 16.0 Thread-Index: AQDGjP2RbygM6OgQDf5lSYIfNL/jKQHbEZiLrG884cA= Content-Type: text/plain; charset="gb2312" Content-Transfer-Encoding: quoted-printable Content-Language: zh-cn Yunhua: Please also fix it in edk2\BaseTools\BinPipWrappers\PosixLike\BrotliCompress. Thanks Liming > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > =B7=A2=BC=FE=C8=CB: bounce+27952+71273+4905953+8761045@groups.io > =B4=FA=B1=ED gaoliming > =B7=A2=CB=CD=CA=B1=BC=E4: 2021=C4=EA2=D4=C25=C8=D5 9:13 > =CA=D5=BC=FE=C8=CB: 'Yunhua Feng' ; > devel@edk2.groups.io > =B3=AD=CB=CD: 'Bob Feng' ; 'Yuwei Chen' > > =D6=F7=CC=E2: [edk2-devel] =BB=D8=B8=B4: [PATCH] BaseTools: Fix BrotliCo= mpress run issue on > Linux >=20 > Reviewed-by: Liming Gao >=20 > > -----=D3=CA=BC=FE=D4=AD=BC=FE----- > > =B7=A2=BC=FE=C8=CB: Yunhua Feng > > =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 ; Liming Gao > > ; Yuwei Chen > > =D6=F7=CC=E2: [PATCH] BaseTools: Fix BrotliCompress run issue on Linux > > > > REF: https://bugzilla.tianocore.org/show_bug.cgi?id=3D3210 > > BrotliCompress changed, but not completely on Linux > > > > Cc: Bob Feng > > Cc: Liming Gao > > Cc: Yuwei Chen > > Signed-off-by: Yunhua Feng > > --- > > 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=3D${BASH_SOURCE:-$0} # see > > http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is n= ot > 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 > > > > +full_cmd=3D${BASH_SOURCE:-$0} # see > > http://mywiki.wooledge.org/BashFAQ/028 for a discussion of why $0 is n= ot > 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 > > > > -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 >=20 >=20 >=20 >=20 >=20 >=20 >=20