Hi Bob, Reviewed-by: Michael D Kinney <michael.d.kin...@intel.com>
It is difficult to see the changes. I did verify that the file before the patch had mixed line endings and the one after the patch is LF only line endings. Minor issues with Author name with a ','. I fixed that when I added the rb to the commit message. Best regards, Mike > -----Original Message----- > From: Feng, Bob C <bob.c.f...@intel.com> > Sent: Tuesday, February 9, 2021 7:03 AM > To: Kinney, Michael D <michael.d.kin...@intel.com>; Leif Lindholm > <l...@nuviainc.com> > Cc: devel@edk2.groups.io; Liming Gao <gaolim...@byosoft.com.cn>; Chen, > Christine <yuwei.c...@intel.com>; Matthew Carlson > <matthewfcarl...@gmail.com> > Subject: RE: [Patch] BaseTools: Fix the ending character for Linux script > BuildEnv > > Hi Mike > > Could you help review this patch and push it? > Liming may take leave now. > > Thanks, > Bob > > -----Original Message----- > From: Leif Lindholm <l...@nuviainc.com> > Sent: Tuesday, February 9, 2021 11:01 PM > To: Feng, Bob C <bob.c.f...@intel.com> > Cc: devel@edk2.groups.io; Liming Gao <gaolim...@byosoft.com.cn>; Chen, > Christine <yuwei.c...@intel.com>; Matthew Carlson > <matthewfcarl...@gmail.com>; Kinney, Michael D <michael.d.kin...@intel.com> > Subject: Re: [Patch] BaseTools: Fix the ending character for Linux script > BuildEnv > > On Tue, Feb 09, 2021 at 22:58:08 +0800, Bob Feng wrote: > > Signed-off-by: Bob Feng <bob.c.f...@intel.com> > > Cc: Liming Gao <gaolim...@byosoft.com.cn> > > Cc: Yuwei Chen <yuwei.c...@intel.com> > > Cc: Matthew Carlson <matthewfcarl...@gmail.com> > > Cc: Michael D Kinney <michael.d.kin...@intel.com> > > Cc: Leif Lindholm <l...@nuviainc.com> > > SMTP strips the intersting aspect, but as long as the end result is a > BuildEnv that has no <CR> characters: > Reviewed-by: Leif Lindholm <l...@nuviainc.com> > > > --- > > BaseTools/BuildEnv | 24 ++++++++++++------------ > > 1 file changed, 12 insertions(+), 12 deletions(-) > > > > diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv index > > 8d283e10c0..275f4c5901 100755 > > --- a/BaseTools/BuildEnv > > +++ b/BaseTools/BuildEnv > > @@ -44,11 +44,11 @@ RestorePreviousConfiguration() { > > break > > fi > > done > > fi > > fi > > - > > + > > PREVIOUS_CONF_FILE=$CONF_PATH/BuildEnv.sh > > if [ -e $PREVIOUS_CONF_FILE ] > > then > > echo Loading previous configuration from $PREVIOUS_CONF_FILE > > . $PREVIOUS_CONF_FILE > > @@ -196,21 +196,21 @@ AddEdkToolsToPath() { > > return 1 > > fi > > > > EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory` > > > > - # check if the edk2basetools pip package is available > > - if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then > > - # if it is, use the pip version of the wrappers > > - echo "Using Pip Basetools" > > - AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike > > - else > > - echo "Using EDK2 in-source Basetools" > > - AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > > - fi > > - > > - > > + # check if the edk2basetools pip package is available if > > + $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then > > + # if it is, use the pip version of the wrappers > > + echo "Using Pip Basetools" > > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike > > + else > > + echo "Using EDK2 in-source Basetools" > > + AddDirToStartOfPath $EDK_TOOLS_PATH/BinWrappers/PosixLike > > + fi > > + > > + > > AddDirToStartOfPath $EDK_TOOLS_PATH_BIN > > > > } > > > > CopySingleTemplateFile() { > > -- > > 2.29.1.windows.1 > > -=-=-=-=-=-=-=-=-=-=-=- Groups.io Links: You receive all messages sent to this group. View/Reply Online (#71548): https://edk2.groups.io/g/devel/message/71548 Mute This Topic: https://groups.io/mt/80506146/21656 Group Owner: devel+ow...@edk2.groups.io Unsubscribe: https://edk2.groups.io/g/devel/unsub [arch...@mail-archive.com] -=-=-=-=-=-=-=-=-=-=-=-