1. Patchew
  2. EDK2
  3. View series

[edk2-devel] [Patch] BaseTools: Fix the ending character for Linux script BuildEnv

Bob Feng posted 1 patch 3 years, 2 months ago
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/edk2 tags/patchew/20210209145808.451-1-bob.c.feng@intel.com
BaseTools/BuildEnv | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
[edk2-devel] [Patch] BaseTools: Fix the ending character for Linux script BuildEnv
Posted by Bob Feng 3 years, 2 months ago 
Signed-off-by: Bob Feng <bob.c.feng@intel.com>
Cc: Liming Gao <gaoliming@byosoft.com.cn>
Cc: Yuwei Chen <yuwei.chen@intel.com>
Cc: Matthew Carlson <matthewfcarlson@gmail.com>
Cc: Michael D  Kinney <michael.d.kinney@intel.com>
Cc: Leif Lindholm <leif@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 (#71521): https://edk2.groups.io/g/devel/message/71521
Mute This Topic: https://groups.io/mt/80506146/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch] BaseTools: Fix the ending character for Linux script BuildEnv
Posted by Leif Lindholm 3 years, 2 months ago 
On Tue, Feb 09, 2021 at 22:58:08 +0800, Bob Feng wrote:
> Signed-off-by: Bob Feng <bob.c.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Matthew Carlson <matthewfcarlson@gmail.com>
> Cc: Michael D  Kinney <michael.d.kinney@intel.com>
> Cc: Leif Lindholm <leif@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 <leif@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 (#71523): https://edk2.groups.io/g/devel/message/71523
Mute This Topic: https://groups.io/mt/80506146/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch] BaseTools: Fix the ending character for Linux script BuildEnv
Posted by Bob Feng 3 years, 2 months ago 
Hi Mike

Could you help review this patch and push it? 
Liming may take leave now.

Thanks,
Bob

-----Original Message-----
From: Leif Lindholm <leif@nuviainc.com> 
Sent: Tuesday, February 9, 2021 11:01 PM
To: Feng, Bob C <bob.c.feng@intel.com>
Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson <matthewfcarlson@gmail.com>; Kinney, Michael D <michael.d.kinney@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.feng@intel.com>
> Cc: Liming Gao <gaoliming@byosoft.com.cn>
> Cc: Yuwei Chen <yuwei.chen@intel.com>
> Cc: Matthew Carlson <matthewfcarlson@gmail.com>
> Cc: Michael D  Kinney <michael.d.kinney@intel.com>
> Cc: Leif Lindholm <leif@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 <leif@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 (#71524): https://edk2.groups.io/g/devel/message/71524
Mute This Topic: https://groups.io/mt/80506146/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch] BaseTools: Fix the ending character for Linux script BuildEnv
Posted by Michael D Kinney 3 years, 2 months ago 
Hi Bob,

Reviewed-by: Michael D Kinney <michael.d.kinney@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.feng@intel.com>
> Sent: Tuesday, February 9, 2021 7:03 AM
> To: Kinney, Michael D <michael.d.kinney@intel.com>; Leif Lindholm <leif@nuviainc.com>
> Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson
> <matthewfcarlson@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 <leif@nuviainc.com>
> Sent: Tuesday, February 9, 2021 11:01 PM
> To: Feng, Bob C <bob.c.feng@intel.com>
> Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson
> <matthewfcarlson@gmail.com>; Kinney, Michael D <michael.d.kinney@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.feng@intel.com>
> > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > Cc: Yuwei Chen <yuwei.chen@intel.com>
> > Cc: Matthew Carlson <matthewfcarlson@gmail.com>
> > Cc: Michael D  Kinney <michael.d.kinney@intel.com>
> > Cc: Leif Lindholm <leif@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 <leif@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/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch] BaseTools: Fix the ending character for Linux script BuildEnv
Posted by Michael D Kinney 3 years, 2 months ago 
Pushed

PR: https://github.com/tianocore/edk2/pull/1419
Commit: https://github.com/tianocore/edk2/pull/1419/commits/c10b513830e63fa4fc28f1edc43352de8d97b61f

Mike
 

> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney@intel.com>
> Sent: Tuesday, February 9, 2021 5:21 PM
> To: Feng, Bob C <bob.c.feng@intel.com>; Leif Lindholm <leif@nuviainc.com>; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson
> <matthewfcarlson@gmail.com>
> Subject: RE: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv
> 
> Hi Bob,
> 
> Reviewed-by: Michael D Kinney <michael.d.kinney@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.feng@intel.com>
> > Sent: Tuesday, February 9, 2021 7:03 AM
> > To: Kinney, Michael D <michael.d.kinney@intel.com>; Leif Lindholm <leif@nuviainc.com>
> > Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson
> > <matthewfcarlson@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 <leif@nuviainc.com>
> > Sent: Tuesday, February 9, 2021 11:01 PM
> > To: Feng, Bob C <bob.c.feng@intel.com>
> > Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson
> > <matthewfcarlson@gmail.com>; Kinney, Michael D <michael.d.kinney@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.feng@intel.com>
> > > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > > Cc: Yuwei Chen <yuwei.chen@intel.com>
> > > Cc: Matthew Carlson <matthewfcarlson@gmail.com>
> > > Cc: Michael D  Kinney <michael.d.kinney@intel.com>
> > > Cc: Leif Lindholm <leif@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 <leif@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 (#71556): https://edk2.groups.io/g/devel/message/71556
Mute This Topic: https://groups.io/mt/80506146/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] [Patch] BaseTools: Fix the ending character for Linux script BuildEnv
Posted by Bob Feng 3 years, 2 months ago 
Thank you Mike.

Thanks,
Bob 

-----Original Message-----
From: Kinney, Michael D <michael.d.kinney@intel.com> 
Sent: Wednesday, February 10, 2021 9:53 AM
To: Feng, Bob C <bob.c.feng@intel.com>; Leif Lindholm <leif@nuviainc.com>; Kinney, Michael D <michael.d.kinney@intel.com>
Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson <matthewfcarlson@gmail.com>
Subject: RE: [Patch] BaseTools: Fix the ending character for Linux script BuildEnv

Pushed

PR: https://github.com/tianocore/edk2/pull/1419
Commit: https://github.com/tianocore/edk2/pull/1419/commits/c10b513830e63fa4fc28f1edc43352de8d97b61f

Mike
 

> -----Original Message-----
> From: Kinney, Michael D <michael.d.kinney@intel.com>
> Sent: Tuesday, February 9, 2021 5:21 PM
> To: Feng, Bob C <bob.c.feng@intel.com>; Leif Lindholm 
> <leif@nuviainc.com>; Kinney, Michael D <michael.d.kinney@intel.com>
> Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Chen, 
> Christine <yuwei.chen@intel.com>; Matthew Carlson 
> <matthewfcarlson@gmail.com>
> Subject: RE: [Patch] BaseTools: Fix the ending character for Linux 
> script BuildEnv
> 
> Hi Bob,
> 
> Reviewed-by: Michael D Kinney <michael.d.kinney@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.feng@intel.com>
> > Sent: Tuesday, February 9, 2021 7:03 AM
> > To: Kinney, Michael D <michael.d.kinney@intel.com>; Leif Lindholm 
> > <leif@nuviainc.com>
> > Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; 
> > Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson 
> > <matthewfcarlson@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 <leif@nuviainc.com>
> > Sent: Tuesday, February 9, 2021 11:01 PM
> > To: Feng, Bob C <bob.c.feng@intel.com>
> > Cc: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; 
> > Chen, Christine <yuwei.chen@intel.com>; Matthew Carlson 
> > <matthewfcarlson@gmail.com>; Kinney, Michael D 
> > <michael.d.kinney@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.feng@intel.com>
> > > Cc: Liming Gao <gaoliming@byosoft.com.cn>
> > > Cc: Yuwei Chen <yuwei.chen@intel.com>
> > > Cc: Matthew Carlson <matthewfcarlson@gmail.com>
> > > Cc: Michael D  Kinney <michael.d.kinney@intel.com>
> > > Cc: Leif Lindholm <leif@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 <leif@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 (#71572): https://edk2.groups.io/g/devel/message/71572
Mute This Topic: https://groups.io/mt/80506146/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-

Patchew 2.1-devel-0870f84

© 2016 - 2024 Red Hat, Inc.