[PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[Rebecca Cran]

Remove bashisms from edksetup.sh and BaseTools/BuildEnv. This allows any
POSIX shell to use those scripts, removing the dependency on bash.

Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
---
 BaseTools/BuildEnv | 30 +++----
 edksetup.sh        | 89 +++-----------------
 2 files changed, 26 insertions(+), 93 deletions(-)

diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
index 275f4c5901aa..bd6235d74fa7 100755
--- a/BaseTools/BuildEnv
+++ b/BaseTools/BuildEnv
@@ -20,7 +20,8 @@ SetWorkspace() {
   #
   # Set $WORKSPACE
   #
-  export WORKSPACE=`pwd`
+  WORKSPACE=$(pwd)
+  export WORKSPACE
 
   return 0
 
@@ -35,8 +36,7 @@ RestorePreviousConfiguration() {
     export CONF_PATH=$WORKSPACE/Conf
     if [ ! -d $WORKSPACE/Conf ] && [ -n "$PACKAGES_PATH" ]
     then
-      PATH_LIST=${PACKAGES_PATH//:/ }
-      for DIR in $PATH_LIST
+      for DIR in $(echo $PACKAGES_PATH | tr ':' ' ')
       do
         if [ -d $DIR/Conf ]
         then
@@ -70,7 +70,13 @@ GenerateShellCodeToUpdatePath() {
   OUTPUT_FILE=$1
   echo "if [ -e $EDK_TOOLS_PATH_BIN ]"                        >> $OUTPUT_FILE
   echo "then"                                                 >> $OUTPUT_FILE
-  echo "  if [ "\${PATH/$EDK_TOOLS_PATH_BIN/}" == "\$PATH" ]" >> $OUTPUT_FILE
+  echo "  FOUND_TOOLS_PATH_BIN=0"                             >> $OUTPUT_FILE
+  echo "  for DIR in \$(echo \$PATH | tr ':' ' '); do"        >> $OUTPUT_FILE
+  echo "    if [ \"\$DIR\" = \"$EDK_TOOLS_PATH_BIN\" ]; then" >> $OUTPUT_FILE
+  echo "      FOUND_TOOLS_PATH_BIN=1"                         >> $OUTPUT_FILE
+  echo "    fi"                                               >> $OUTPUT_FILE
+  echo "  done"                                               >> $OUTPUT_FILE
+  echo "  if [ \$FOUND_TOOLS_PATH_BIN = 0 ]"                  >> $OUTPUT_FILE
   echo "  then"                                               >> $OUTPUT_FILE
   echo "    export PATH=$EDK_TOOLS_PATH_BIN:\$PATH"           >> $OUTPUT_FILE
   echo "  fi"                                                 >> $OUTPUT_FILE
@@ -84,7 +90,7 @@ StoreCurrentConfiguration() {
   #
   OUTPUT_FILE=$CONF_PATH/BuildEnv.sh
   #echo Storing current configuration into $OUTPUT_FILE
-  echo "# Auto-generated by ${BASH_SOURCE[0]}" >| $OUTPUT_FILE
+  echo "# Auto-generated by BaseTools/BuildEnv" >| $OUTPUT_FILE
   GenerateShellCodeToSetVariable WORKSPACE $OUTPUT_FILE
   GenerateShellCodeToSetVariable EDK_TOOLS_PATH $OUTPUT_FILE
   GenerateShellCodeToUpdatePath $OUTPUT_FILE
@@ -130,10 +136,9 @@ SetEdkToolsPath() {
   #
   # Try $PACKAGES_PATH
   #
-  if [ -n "$PACKAGES_PATH"]
+  if [ -n "$PACKAGES_PATH" ]
   then
-    PATH_LIST=${PACKAGES_PATH//:/ }
-    for DIR in $PATH_LIST
+    for DIR in $(echo $PACKAGES_PATH | tr ':' ' ')
     do
       if [ -d $DIR/BaseTools ]
       then
@@ -156,10 +161,7 @@ GetBaseToolsBinSubDir() {
   #
   # Figure out a uniq directory name from the uname command
   #
-  UNAME_DIRNAME=`uname -sm`
-  UNAME_DIRNAME=${UNAME_DIRNAME// /-}
-  UNAME_DIRNAME=${UNAME_DIRNAME//\//-}
-  echo $UNAME_DIRNAME
+  echo $(uname -sm | tr ' ' '-')
 }
 
 GetEdkToolsPathBinDirectory() {
@@ -180,8 +182,6 @@ GetEdkToolsPathBinDirectory() {
 
 AddDirToStartOfPath() {
   DIRNAME=$1
-  PATH=$DIRNAME:$DIRNAME:$DIRNAME:$PATH
-  PATH=${PATH//$DIRNAME:/}
   PATH=$DIRNAME:$PATH
   export PATH
 }
@@ -199,7 +199,7 @@ AddEdkToolsToPath() {
   EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory`
 
   # check if the edk2basetools pip package is available
-  if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then
+  if $PYTHON_COMMAND -c "import edk2basetools" > /dev/null 2>&1; then
     # if it is, use the pip version of the wrappers
     echo "Using Pip Basetools"
     AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike
diff --git a/edksetup.sh b/edksetup.sh
index 06d2f041e635..cab3a8c113e0 100755
--- a/edksetup.sh
+++ b/edksetup.sh
@@ -20,7 +20,7 @@
 SCRIPTNAME="edksetup.sh"
 RECONFIG=FALSE
 
-function HelpMsg()
+HelpMsg()
 {
   echo "Usage: $SCRIPTNAME [Options]"
   echo
@@ -38,7 +38,7 @@ function HelpMsg()
   echo "source $SCRIPTNAME"
 }
 
-function SetWorkspace()
+SetWorkspace()
 {
   #
   # If WORKSPACE is already set, then we can return right now
@@ -49,10 +49,10 @@ function SetWorkspace()
     return 0
   fi
 
-  if [ ! ${BASH_SOURCE[0]} -ef ./$SCRIPTNAME ] && [ -z "$PACKAGES_PATH" ]
+  if [ ! -f ${SCRIPTNAME} ] && [ -z "$PACKAGES_PATH" ]
   then
-    echo Run this script from the base of your tree.  For example:
-    echo "  cd /Path/To/Edk/Root"
+    echo Source this script from the base of your tree.  For example:
+    echo "  cd /Path/To/Edk2/Clone"
     echo "  . $SCRIPTNAME"
     return 1
   fi
@@ -75,7 +75,7 @@ function SetWorkspace()
   return 0
 }
 
-function SetupEnv()
+SetupEnv()
 {
   if [ -n "$EDK_TOOLS_PATH" ]
   then
@@ -85,9 +85,7 @@ function SetupEnv()
     . $WORKSPACE/BaseTools/BuildEnv
   elif [ -n "$PACKAGES_PATH" ]
   then
-    PATH_LIST=$PACKAGES_PATH
-    PATH_LIST=${PATH_LIST//:/ }
-    for DIR in $PATH_LIST
+    for DIR in $(echo $PACKAGES_PATH | tr ':' ' ')
     do
       if [ -f "$DIR/BaseTools/BuildEnv" ]
       then
@@ -105,81 +103,16 @@ function SetupEnv()
   fi
 }
 
-function SetupPython3()
+SetupPython3()
 {
-  if [ $origin_version ];then
-    origin_version=
-  fi
-  for python in $(whereis python3)
-  do
-    python=$(echo $python | grep "[[:digit:]]$" || true)
-    python_version=${python##*python}
-    if [ -z "${python_version}" ] || (! command -v $python >/dev/null 2>&1);then
-      continue
-    fi
-    if [ -z $origin_version ];then
-      origin_version=$python_version
-      export PYTHON_COMMAND=$python
-      continue
-    fi
-      if [[ "$origin_version" < "$python_version" ]]; then
-      origin_version=$python_version
-      export PYTHON_COMMAND=$python
-    fi
-  done
-  return 0
+  export PYTHON_COMMAND=python3
 }
 
-function SetupPython()
+SourceEnv()
 {
-  if [ $PYTHON_COMMAND ] && [ -z $PYTHON3_ENABLE ];then
-    if ( command -v $PYTHON_COMMAND >/dev/null 2>&1 );then
-      return 0
-    else
-      echo $PYTHON_COMMAND Cannot be used to build or execute the python tools.
-      return 1
-    fi
-  fi
-
-  if [ $PYTHON3_ENABLE ] && [ $PYTHON3_ENABLE == TRUE ]
-  then
-    SetupPython3
-  fi
-
-  if [ $PYTHON3_ENABLE ] && [ $PYTHON3_ENABLE != TRUE ]
-  then
-    if [ $origin_version ];then
-      origin_version=
-    fi
-    for python in $(whereis python2)
-    do
-      python=$(echo $python | grep "[[:digit:]]$" || true)
-      python_version=${python##*python}
-      if [ -z "${python_version}" ] || (! command -v $python >/dev/null 2>&1);then
-        continue
-      fi
-      if [ -z $origin_version ]
-      then
-        origin_version=$python_version
-        export PYTHON_COMMAND=$python
-        continue
-      fi
-      if [[ "$origin_version" < "$python_version" ]]; then
-        origin_version=$python_version
-        export PYTHON_COMMAND=$python
-      fi
-    done
-    return 0
-  fi
-
   SetupPython3
-}
-
-function SourceEnv()
-{
-  SetWorkspace &&
+  SetWorkspace
   SetupEnv
-  SetupPython
 }
 
 I=$#
-- 
2.40.1

Re: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[Pedro Falcato]

On Sat, May 6, 2023 at 7:23 PM Rebecca Cran <rebecca@bsdio.com> wrote:
>
> Remove bashisms from edksetup.sh and BaseTools/BuildEnv. This allows any
> POSIX shell to use those scripts, removing the dependency on bash.
>
> Signed-off-by: Rebecca Cran <rebecca@bsdio.com>
> ---
>  BaseTools/BuildEnv | 30 +++----
>  edksetup.sh        | 89 +++-----------------
>  2 files changed, 26 insertions(+), 93 deletions(-)
>
> diff --git a/BaseTools/BuildEnv b/BaseTools/BuildEnv
> index 275f4c5901aa..bd6235d74fa7 100755
> --- a/BaseTools/BuildEnv
> +++ b/BaseTools/BuildEnv
> @@ -20,7 +20,8 @@ SetWorkspace() {
>    #
>    # Set $WORKSPACE
>    #
> -  export WORKSPACE=`pwd`
> +  WORKSPACE=$(pwd)
> +  export WORKSPACE
>
>    return 0
>
> @@ -35,8 +36,7 @@ RestorePreviousConfiguration() {
>      export CONF_PATH=$WORKSPACE/Conf
>      if [ ! -d $WORKSPACE/Conf ] && [ -n "$PACKAGES_PATH" ]
>      then
> -      PATH_LIST=${PACKAGES_PATH//:/ }
> -      for DIR in $PATH_LIST
> +      for DIR in $(echo $PACKAGES_PATH | tr ':' ' ')
>        do
>          if [ -d $DIR/Conf ]
>          then
> @@ -70,7 +70,13 @@ GenerateShellCodeToUpdatePath() {
>    OUTPUT_FILE=$1
>    echo "if [ -e $EDK_TOOLS_PATH_BIN ]"                        >> $OUTPUT_FILE
>    echo "then"                                                 >> $OUTPUT_FILE
> -  echo "  if [ "\${PATH/$EDK_TOOLS_PATH_BIN/}" == "\$PATH" ]" >> $OUTPUT_FILE
> +  echo "  FOUND_TOOLS_PATH_BIN=0"                             >> $OUTPUT_FILE
> +  echo "  for DIR in \$(echo \$PATH | tr ':' ' '); do"        >> $OUTPUT_FILE
> +  echo "    if [ \"\$DIR\" = \"$EDK_TOOLS_PATH_BIN\" ]; then" >> $OUTPUT_FILE
> +  echo "      FOUND_TOOLS_PATH_BIN=1"                         >> $OUTPUT_FILE
> +  echo "    fi"                                               >> $OUTPUT_FILE
> +  echo "  done"                                               >> $OUTPUT_FILE
> +  echo "  if [ \$FOUND_TOOLS_PATH_BIN = 0 ]"                  >> $OUTPUT_FILE
>    echo "  then"                                               >> $OUTPUT_FILE
>    echo "    export PATH=$EDK_TOOLS_PATH_BIN:\$PATH"           >> $OUTPUT_FILE
>    echo "  fi"                                                 >> $OUTPUT_FILE
> @@ -84,7 +90,7 @@ StoreCurrentConfiguration() {
>    #
>    OUTPUT_FILE=$CONF_PATH/BuildEnv.sh
>    #echo Storing current configuration into $OUTPUT_FILE
> -  echo "# Auto-generated by ${BASH_SOURCE[0]}" >| $OUTPUT_FILE
> +  echo "# Auto-generated by BaseTools/BuildEnv" >| $OUTPUT_FILE
>    GenerateShellCodeToSetVariable WORKSPACE $OUTPUT_FILE
>    GenerateShellCodeToSetVariable EDK_TOOLS_PATH $OUTPUT_FILE
>    GenerateShellCodeToUpdatePath $OUTPUT_FILE
> @@ -130,10 +136,9 @@ SetEdkToolsPath() {
>    #
>    # Try $PACKAGES_PATH
>    #
> -  if [ -n "$PACKAGES_PATH"]
> +  if [ -n "$PACKAGES_PATH" ]
>    then
> -    PATH_LIST=${PACKAGES_PATH//:/ }
> -    for DIR in $PATH_LIST
> +    for DIR in $(echo $PACKAGES_PATH | tr ':' ' ')
>      do
>        if [ -d $DIR/BaseTools ]
>        then
> @@ -156,10 +161,7 @@ GetBaseToolsBinSubDir() {
>    #
>    # Figure out a uniq directory name from the uname command
>    #
> -  UNAME_DIRNAME=`uname -sm`
> -  UNAME_DIRNAME=${UNAME_DIRNAME// /-}
> -  UNAME_DIRNAME=${UNAME_DIRNAME//\//-}
> -  echo $UNAME_DIRNAME
> +  echo $(uname -sm | tr ' ' '-')
>  }
>
>  GetEdkToolsPathBinDirectory() {
> @@ -180,8 +182,6 @@ GetEdkToolsPathBinDirectory() {
>
>  AddDirToStartOfPath() {
>    DIRNAME=$1
> -  PATH=$DIRNAME:$DIRNAME:$DIRNAME:$PATH
> -  PATH=${PATH//$DIRNAME:/}
>    PATH=$DIRNAME:$PATH
>    export PATH
>  }
> @@ -199,7 +199,7 @@ AddEdkToolsToPath() {
>    EDK_TOOLS_PATH_BIN=`GetEdkToolsPathBinDirectory`
>
>    # check if the edk2basetools pip package is available
> -  if $PYTHON_COMMAND -c "import edk2basetools" &> /dev/null; then
> +  if $PYTHON_COMMAND -c "import edk2basetools" > /dev/null 2>&1; then
>      # if it is, use the pip version of the wrappers
>      echo "Using Pip Basetools"
>      AddDirToStartOfPath $EDK_TOOLS_PATH/BinPipWrappers/PosixLike
> diff --git a/edksetup.sh b/edksetup.sh
> index 06d2f041e635..cab3a8c113e0 100755
> --- a/edksetup.sh
> +++ b/edksetup.sh
> @@ -20,7 +20,7 @@
>  SCRIPTNAME="edksetup.sh"
>  RECONFIG=FALSE
>
> -function HelpMsg()
> +HelpMsg()
>  {
>    echo "Usage: $SCRIPTNAME [Options]"
>    echo
> @@ -38,7 +38,7 @@ function HelpMsg()
>    echo "source $SCRIPTNAME"
>  }
>
> -function SetWorkspace()
> +SetWorkspace()
>  {
>    #
>    # If WORKSPACE is already set, then we can return right now
> @@ -49,10 +49,10 @@ function SetWorkspace()
>      return 0
>    fi
>
> -  if [ ! ${BASH_SOURCE[0]} -ef ./$SCRIPTNAME ] && [ -z "$PACKAGES_PATH" ]
> +  if [ ! -f ${SCRIPTNAME} ] && [ -z "$PACKAGES_PATH" ]
>    then
> -    echo Run this script from the base of your tree.  For example:
> -    echo "  cd /Path/To/Edk/Root"
> +    echo Source this script from the base of your tree.  For example:
> +    echo "  cd /Path/To/Edk2/Clone"
>      echo "  . $SCRIPTNAME"
>      return 1
>    fi
> @@ -75,7 +75,7 @@ function SetWorkspace()
>    return 0
>  }
>
> -function SetupEnv()
> +SetupEnv()
>  {
>    if [ -n "$EDK_TOOLS_PATH" ]
>    then
> @@ -85,9 +85,7 @@ function SetupEnv()
>      . $WORKSPACE/BaseTools/BuildEnv
>    elif [ -n "$PACKAGES_PATH" ]
>    then
> -    PATH_LIST=$PACKAGES_PATH
> -    PATH_LIST=${PATH_LIST//:/ }
> -    for DIR in $PATH_LIST
> +    for DIR in $(echo $PACKAGES_PATH | tr ':' ' ')
>      do
>        if [ -f "$DIR/BaseTools/BuildEnv" ]
>        then
> @@ -105,81 +103,16 @@ function SetupEnv()
>    fi
>  }
>
> -function SetupPython3()
> +SetupPython3()
>  {
> -  if [ $origin_version ];then
> -    origin_version=
> -  fi
> -  for python in $(whereis python3)
> -  do
> -    python=$(echo $python | grep "[[:digit:]]$" || true)
> -    python_version=${python##*python}
> -    if [ -z "${python_version}" ] || (! command -v $python >/dev/null 2>&1);then
> -      continue
> -    fi
> -    if [ -z $origin_version ];then
> -      origin_version=$python_version
> -      export PYTHON_COMMAND=$python
> -      continue
> -    fi
> -      if [[ "$origin_version" < "$python_version" ]]; then
> -      origin_version=$python_version
> -      export PYTHON_COMMAND=$python
> -    fi
> -  done
> -  return 0
> +  export PYTHON_COMMAND=python3

Did you test this in FreeBSD (and hopefully other BSDs, such as Net)?
As far as I know, those don't package a python3 symlink (only
python3.{version}).

At a glance, the rest of the changes look ok-ish to me though.

-- 
Pedro

Re: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[Rebecca Cran]

On 5/6/23 12:34, Pedro Falcato wrote:
> Did you test this in FreeBSD (and hopefully other BSDs, such as Net)?
> As far as I know, those don't package a python3 symlink (only
> python3.{version}).
>
> At a glance, the rest of the changes look ok-ish to me though.

I only tested on FreeBSD, where the behavior is the same as before: I 
still need to specify PYTHON_COMMAND=python3.9 .


-- 
Rebecca Cran

Re: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[Rebecca Cran]

Actually, the python package provides a python command, and python3 
provides a python3 command, both of which are Python 3.9.16.

So I no longer need to specify PYTHON_COMMAND.


bcran@maxamd:~/src/uefi/edk2 % /bin/sh

$ . edksetup.sh

Loading previous configuration from 
/home/bcran/src/uefi/edk2/Conf/BuildEnv.sh
Using EDK2 in-source Basetools
WORKSPACE: /home/bcran/src/uefi/edk2
EDK_TOOLS_PATH: /home/bcran/src/uefi/edk2/BaseTools
CONF_PATH: /home/bcran/src/uefi/edk2/Conf
$ echo $PYTHON_COMMAND
python3
$ python3 --version
Python 3.9.16

-- 

Rebecca Cran


On 5/6/23 13:34, Rebecca Cran wrote:
> On 5/6/23 12:34, Pedro Falcato wrote:
>> Did you test this in FreeBSD (and hopefully other BSDs, such as Net)?
>> As far as I know, those don't package a python3 symlink (only
>> python3.{version}).
>>
>> At a glance, the rest of the changes look ok-ish to me though.
>
> I only tested on FreeBSD, where the behavior is the same as before: I 
> still need to specify PYTHON_COMMAND=python3.9 .
>
>

Re: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[Pedro Falcato]

On Sat, May 6, 2023 at 8:45 PM Rebecca Cran <rebecca@bsdio.com> wrote:
>
> Actually, the python package provides a python command, and python3
> provides a python3 command, both of which are Python 3.9.16.
>
> So I no longer need to specify PYTHON_COMMAND.
>
>
> bcran@maxamd:~/src/uefi/edk2 % /bin/sh
>
> $ . edksetup.sh
>
> Loading previous configuration from
> /home/bcran/src/uefi/edk2/Conf/BuildEnv.sh
> Using EDK2 in-source Basetools
> WORKSPACE: /home/bcran/src/uefi/edk2
> EDK_TOOLS_PATH: /home/bcran/src/uefi/edk2/BaseTools
> CONF_PATH: /home/bcran/src/uefi/edk2/Conf
> $ echo $PYTHON_COMMAND
> python3
> $ python3 --version
> Python 3.9.16

My local installations of Net (latest stable) and FreeBSD (13.1 with a
hacked-up kernel) do not have a python3 symlink.

I'm slightly worried that this breaks something. I know requiring
whereis isn't ideal, but I'm fairly sure it did handle this situation?

-- 
Pedro

Re: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[Rebecca Cran]

On 5/6/23 15:48, Pedro Falcato wrote:
>
> My local installations of Net (latest stable) and FreeBSD (13.1 with a
> hacked-up kernel) do not have a python3 symlink.
>
> I'm slightly worried that this breaks something. I know requiring
> whereis isn't ideal, but I'm fairly sure it did handle this situation?

I uninstalled the python and python3 packages, leaving only python39.

I got the following results on edk2 master:


[bcran@maxamd ~/src/uefi/edk2]$ whereis python3
python3:

[bcran@maxamd ~/src/uefi/edk2]$ ls /usr/local/bin | grep python

python3.9

python3.9-config

[bcran@maxamd ~/src/uefi/edk2]$ . edksetup.sh
Using EDK2 in-source Basetools
WORKSPACE: /home/bcran/src/uefi/edk2
EDK_TOOLS_PATH: /home/bcran/src/uefi/edk2/BaseTools

CONF_PATH: /home/bcran/src/uefi/edk2/Conf


[bcran@maxamd ~/src/uefi/edk2]$ echo $PYTHON_COMMAND

[bcran@maxamd ~/src/uefi/edk2]$ gmake -C BaseTools/ -j16
gmake: Entering directory '/usr/home/bcran/src/uefi/edk2/BaseTools'
gmake -C Source/C
gmake -C Source/Python
gmake[1]: Entering directory 
'/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C'
gmake[1]: Entering directory 
'/usr/home/bcran/src/uefi/edk2/BaseTools/Source/Python'
gmake[1]: Nothing to be done for 'all'.
gmake[1]: Leaving directory 
'/usr/home/bcran/src/uefi/edk2/BaseTools/Source/Python'
Attempting to detect HOST_ARCH from 'uname -m': amd64
Detected HOST_ARCH of X64 using uname.
mkdir -p .
mkdir ./libs
mkdir ./bin
gmake -C VfrCompile VfrLexer.h
gmake -C Common
gmake[2]: Entering directory 
'/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C/VfrCompile'
gmake[2]: Entering directory 
'/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C/Common'

.....

Finished building BaseTools C Tools with HOST_ARCH=X64
gmake[1]: Leaving directory 
'/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C'
gmake -C Tests
gmake[1]: Entering directory '/usr/home/bcran/src/uefi/edk2/BaseTools/Tests'
/bin/sh: python: not found
gmake[1]: *** [GNUmakefile:11: test] Error 127
gmake[1]: Leaving directory '/usr/home/bcran/src/uefi/edk2/BaseTools/Tests'
gmake: *** [GNUmakefile:19: Tests] Error 2
gmake: Leaving directory '/usr/home/bcran/src/uefi/edk2/BaseTools'
...

[bcran@maxamd ~/src/uefi/edk2]$ build -p OvmfPkg/OvmfPkgX64.dsc -a X64 
-t GCC -b RELEASE
/home/bcran/src/uefi/edk2/BaseTools/BinWrappers/PosixLike/build: line 
14: exec: python: not found


-- 

Rebecca Cran

Re: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[Pedro Falcato]

On Sun, May 7, 2023 at 4:31 AM Rebecca Cran <rebecca@bsdio.com> wrote:
>
> On 5/6/23 15:48, Pedro Falcato wrote:
> >
> > My local installations of Net (latest stable) and FreeBSD (13.1 with a
> > hacked-up kernel) do not have a python3 symlink.
> >
> > I'm slightly worried that this breaks something. I know requiring
> > whereis isn't ideal, but I'm fairly sure it did handle this situation?
>
> I uninstalled the python and python3 packages, leaving only python39.
>
> I got the following results on edk2 master:
>
>
> [bcran@maxamd ~/src/uefi/edk2]$ whereis python3
> python3:
>
> [bcran@maxamd ~/src/uefi/edk2]$ ls /usr/local/bin | grep python
>
> python3.9
>
> python3.9-config
>
> [bcran@maxamd ~/src/uefi/edk2]$ . edksetup.sh
> Using EDK2 in-source Basetools
> WORKSPACE: /home/bcran/src/uefi/edk2
> EDK_TOOLS_PATH: /home/bcran/src/uefi/edk2/BaseTools
>
> CONF_PATH: /home/bcran/src/uefi/edk2/Conf
>
>
> [bcran@maxamd ~/src/uefi/edk2]$ echo $PYTHON_COMMAND
>
> [bcran@maxamd ~/src/uefi/edk2]$ gmake -C BaseTools/ -j16
> gmake: Entering directory '/usr/home/bcran/src/uefi/edk2/BaseTools'
> gmake -C Source/C
> gmake -C Source/Python
> gmake[1]: Entering directory
> '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C'
> gmake[1]: Entering directory
> '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/Python'
> gmake[1]: Nothing to be done for 'all'.
> gmake[1]: Leaving directory
> '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/Python'
> Attempting to detect HOST_ARCH from 'uname -m': amd64
> Detected HOST_ARCH of X64 using uname.
> mkdir -p .
> mkdir ./libs
> mkdir ./bin
> gmake -C VfrCompile VfrLexer.h
> gmake -C Common
> gmake[2]: Entering directory
> '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C/VfrCompile'
> gmake[2]: Entering directory
> '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C/Common'
>
> .....
>
> Finished building BaseTools C Tools with HOST_ARCH=X64
> gmake[1]: Leaving directory
> '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C'
> gmake -C Tests
> gmake[1]: Entering directory '/usr/home/bcran/src/uefi/edk2/BaseTools/Tests'
> /bin/sh: python: not found
> gmake[1]: *** [GNUmakefile:11: test] Error 127
> gmake[1]: Leaving directory '/usr/home/bcran/src/uefi/edk2/BaseTools/Tests'
> gmake: *** [GNUmakefile:19: Tests] Error 2
> gmake: Leaving directory '/usr/home/bcran/src/uefi/edk2/BaseTools'
> ...
>
> [bcran@maxamd ~/src/uefi/edk2]$ build -p OvmfPkg/OvmfPkgX64.dsc -a X64
> -t GCC -b RELEASE
> /home/bcran/src/uefi/edk2/BaseTools/BinWrappers/PosixLike/build: line
> 14: exec: python: not found

Thank you for your testing. I asked around and came to the conclusion
it's a FreeBSD "meta-package" that lots of people don't have
installed.

If this doesn't break anything, I'm ok with it. Although there should
really be a better solution, the status quo sucks.

That said, the rest of the POSIX sh conversion looks ok to me.

Acked-by: Pedro Falcato <pedro.falcato@gmail.com>

Although there's a small fixup you may want to do at
   >echo "source $SCRIPTNAME"
Since source is not POSIX, but '.' is.

-- 
Pedro

回复: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[gaoliming]

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

> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Pedro Falcato
> 发送时间: 2023年5月7日 11:51
> 收件人: Rebecca Cran <rebecca@bsdio.com>
> 抄送: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Bob
> Feng <bob.c.feng@intel.com>; Yuwei Chen <yuwei.chen@intel.com>; Andrew
> Fish <afish@apple.com>; Leif Lindholm <quic_llindhol@quicinc.com>;
> Michael D Kinney <michael.d.kinney@intel.com>
> 主题: Re: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and
> BaseTools/BuildEnv
> 
> On Sun, May 7, 2023 at 4:31 AM Rebecca Cran <rebecca@bsdio.com> wrote:
> >
> > On 5/6/23 15:48, Pedro Falcato wrote:
> > >
> > > My local installations of Net (latest stable) and FreeBSD (13.1 with a
> > > hacked-up kernel) do not have a python3 symlink.
> > >
> > > I'm slightly worried that this breaks something. I know requiring
> > > whereis isn't ideal, but I'm fairly sure it did handle this situation?
> >
> > I uninstalled the python and python3 packages, leaving only python39.
> >
> > I got the following results on edk2 master:
> >
> >
> > [bcran@maxamd ~/src/uefi/edk2]$ whereis python3
> > python3:
> >
> > [bcran@maxamd ~/src/uefi/edk2]$ ls /usr/local/bin | grep python
> >
> > python3.9
> >
> > python3.9-config
> >
> > [bcran@maxamd ~/src/uefi/edk2]$ . edksetup.sh
> > Using EDK2 in-source Basetools
> > WORKSPACE: /home/bcran/src/uefi/edk2
> > EDK_TOOLS_PATH: /home/bcran/src/uefi/edk2/BaseTools
> >
> > CONF_PATH: /home/bcran/src/uefi/edk2/Conf
> >
> >
> > [bcran@maxamd ~/src/uefi/edk2]$ echo $PYTHON_COMMAND
> >
> > [bcran@maxamd ~/src/uefi/edk2]$ gmake -C BaseTools/ -j16
> > gmake: Entering directory '/usr/home/bcran/src/uefi/edk2/BaseTools'
> > gmake -C Source/C
> > gmake -C Source/Python
> > gmake[1]: Entering directory
> > '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C'
> > gmake[1]: Entering directory
> > '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/Python'
> > gmake[1]: Nothing to be done for 'all'.
> > gmake[1]: Leaving directory
> > '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/Python'
> > Attempting to detect HOST_ARCH from 'uname -m': amd64
> > Detected HOST_ARCH of X64 using uname.
> > mkdir -p .
> > mkdir ./libs
> > mkdir ./bin
> > gmake -C VfrCompile VfrLexer.h
> > gmake -C Common
> > gmake[2]: Entering directory
> > '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C/VfrCompile'
> > gmake[2]: Entering directory
> > '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C/Common'
> >
> > .....
> >
> > Finished building BaseTools C Tools with HOST_ARCH=X64
> > gmake[1]: Leaving directory
> > '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C'
> > gmake -C Tests
> > gmake[1]: Entering directory
> '/usr/home/bcran/src/uefi/edk2/BaseTools/Tests'
> > /bin/sh: python: not found
> > gmake[1]: *** [GNUmakefile:11: test] Error 127
> > gmake[1]: Leaving directory
> '/usr/home/bcran/src/uefi/edk2/BaseTools/Tests'
> > gmake: *** [GNUmakefile:19: Tests] Error 2
> > gmake: Leaving directory '/usr/home/bcran/src/uefi/edk2/BaseTools'
> > ...
> >
> > [bcran@maxamd ~/src/uefi/edk2]$ build -p OvmfPkg/OvmfPkgX64.dsc -a
> X64
> > -t GCC -b RELEASE
> > /home/bcran/src/uefi/edk2/BaseTools/BinWrappers/PosixLike/build: line
> > 14: exec: python: not found
> 
> Thank you for your testing. I asked around and came to the conclusion
> it's a FreeBSD "meta-package" that lots of people don't have
> installed.
> 
> If this doesn't break anything, I'm ok with it. Although there should
> really be a better solution, the status quo sucks.
> 
> That said, the rest of the POSIX sh conversion looks ok to me.
> 
> Acked-by: Pedro Falcato <pedro.falcato@gmail.com>
> 
> Although there's a small fixup you may want to do at
>    >echo "source $SCRIPTNAME"
> Since source is not POSIX, but '.' is.
> 
> --
> Pedro
> 
> 
> 
> 

Re: 回复: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[Rebecca Cran]

I'd like this to go in for the edk2-stable202305 tag.


-- 

Rebecca Cran


On 5/8/23 18:53, gaoliming wrote:
> Reviewed-by: Liming Gao <gaoliming@byosoft.com.cn>
>
>> -----邮件原件-----
>> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Pedro Falcato
>> 发送时间: 2023年5月7日 11:51
>> 收件人: Rebecca Cran <rebecca@bsdio.com>
>> 抄送: devel@edk2.groups.io; Liming Gao <gaoliming@byosoft.com.cn>; Bob
>> Feng <bob.c.feng@intel.com>; Yuwei Chen <yuwei.chen@intel.com>; Andrew
>> Fish <afish@apple.com>; Leif Lindholm <quic_llindhol@quicinc.com>;
>> Michael D Kinney <michael.d.kinney@intel.com>
>> 主题: Re: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and
>> BaseTools/BuildEnv
>>
>> On Sun, May 7, 2023 at 4:31 AM Rebecca Cran <rebecca@bsdio.com> wrote:
>>> On 5/6/23 15:48, Pedro Falcato wrote:
>>>> My local installations of Net (latest stable) and FreeBSD (13.1 with a
>>>> hacked-up kernel) do not have a python3 symlink.
>>>>
>>>> I'm slightly worried that this breaks something. I know requiring
>>>> whereis isn't ideal, but I'm fairly sure it did handle this situation?
>>> I uninstalled the python and python3 packages, leaving only python39.
>>>
>>> I got the following results on edk2 master:
>>>
>>>
>>> [bcran@maxamd ~/src/uefi/edk2]$ whereis python3
>>> python3:
>>>
>>> [bcran@maxamd ~/src/uefi/edk2]$ ls /usr/local/bin | grep python
>>>
>>> python3.9
>>>
>>> python3.9-config
>>>
>>> [bcran@maxamd ~/src/uefi/edk2]$ . edksetup.sh
>>> Using EDK2 in-source Basetools
>>> WORKSPACE: /home/bcran/src/uefi/edk2
>>> EDK_TOOLS_PATH: /home/bcran/src/uefi/edk2/BaseTools
>>>
>>> CONF_PATH: /home/bcran/src/uefi/edk2/Conf
>>>
>>>
>>> [bcran@maxamd ~/src/uefi/edk2]$ echo $PYTHON_COMMAND
>>>
>>> [bcran@maxamd ~/src/uefi/edk2]$ gmake -C BaseTools/ -j16
>>> gmake: Entering directory '/usr/home/bcran/src/uefi/edk2/BaseTools'
>>> gmake -C Source/C
>>> gmake -C Source/Python
>>> gmake[1]: Entering directory
>>> '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C'
>>> gmake[1]: Entering directory
>>> '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/Python'
>>> gmake[1]: Nothing to be done for 'all'.
>>> gmake[1]: Leaving directory
>>> '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/Python'
>>> Attempting to detect HOST_ARCH from 'uname -m': amd64
>>> Detected HOST_ARCH of X64 using uname.
>>> mkdir -p .
>>> mkdir ./libs
>>> mkdir ./bin
>>> gmake -C VfrCompile VfrLexer.h
>>> gmake -C Common
>>> gmake[2]: Entering directory
>>> '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C/VfrCompile'
>>> gmake[2]: Entering directory
>>> '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C/Common'
>>>
>>> .....
>>>
>>> Finished building BaseTools C Tools with HOST_ARCH=X64
>>> gmake[1]: Leaving directory
>>> '/usr/home/bcran/src/uefi/edk2/BaseTools/Source/C'
>>> gmake -C Tests
>>> gmake[1]: Entering directory
>> '/usr/home/bcran/src/uefi/edk2/BaseTools/Tests'
>>> /bin/sh: python: not found
>>> gmake[1]: *** [GNUmakefile:11: test] Error 127
>>> gmake[1]: Leaving directory
>> '/usr/home/bcran/src/uefi/edk2/BaseTools/Tests'
>>> gmake: *** [GNUmakefile:19: Tests] Error 2
>>> gmake: Leaving directory '/usr/home/bcran/src/uefi/edk2/BaseTools'
>>> ...
>>>
>>> [bcran@maxamd ~/src/uefi/edk2]$ build -p OvmfPkg/OvmfPkgX64.dsc -a
>> X64
>>> -t GCC -b RELEASE
>>> /home/bcran/src/uefi/edk2/BaseTools/BinWrappers/PosixLike/build: line
>>> 14: exec: python: not found
>> Thank you for your testing. I asked around and came to the conclusion
>> it's a FreeBSD "meta-package" that lots of people don't have
>> installed.
>>
>> If this doesn't break anything, I'm ok with it. Although there should
>> really be a better solution, the status quo sucks.
>>
>> That said, the rest of the POSIX sh conversion looks ok to me.
>>
>> Acked-by: Pedro Falcato <pedro.falcato@gmail.com>
>>
>> Although there's a small fixup you may want to do at
>>     >echo "source $SCRIPTNAME"
>> Since source is not POSIX, but '.' is.
>>
>> --
>> Pedro
>>
>>
>> 
>>
>
>

Re: 回复: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[Rebecca Cran]

Mike, Liming:


Could you merge this please?

My understanding is that with the freeze I'm not able to set the push 
label to merge this myself.


On 5/8/23 22:28, Rebecca Cran wrote:
> I'd like this to go in for the edk2-stable202305 tag.
>
>

Re: 回复: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[Michael D Kinney]

Is there a PR with Rbs added to commit messages?

Mike

> -----Original Message-----
> From: Rebecca Cran <rebecca@bsdio.com>
> Sent: Tuesday, May 9, 2023 5:29 PM
> To: Gao, Liming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io;
> pedro.falcato@gmail.com
> Cc: Feng, Bob C <bob.c.feng@intel.com>; Chen, Christine
> <yuwei.chen@intel.com>; 'Andrew Fish' <afish@apple.com>; 'Leif Lindholm'
> <quic_llindhol@quicinc.com>; Kinney, Michael D
> <michael.d.kinney@intel.com>
> Subject: Re: 回复: [edk2-devel] [PATCH 1/1] Remove bashisms from
> edksetup.sh and BaseTools/BuildEnv
> 
> Mike, Liming:
> 
> 
> Could you merge this please?
> 
> My understanding is that with the freeze I'm not able to set the push
> label to merge this myself.
> 
> 
> On 5/8/23 22:28, Rebecca Cran wrote:
> > I'd like this to go in for the edk2-stable202305 tag.
> >
> >

Re: 回复: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[Rebecca Cran]

There is now: https://github.com/tianocore/edk2/pull/4303


-- 

Rebecca Cran


On 5/9/23 18:43, Kinney, Michael D wrote:
> Is there a PR with Rbs added to commit messages?
>
> Mike
>
>> -----Original Message-----
>> From: Rebecca Cran <rebecca@bsdio.com>
>> Sent: Tuesday, May 9, 2023 5:29 PM
>> To: Gao, Liming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io;
>> pedro.falcato@gmail.com
>> Cc: Feng, Bob C <bob.c.feng@intel.com>; Chen, Christine
>> <yuwei.chen@intel.com>; 'Andrew Fish' <afish@apple.com>; 'Leif Lindholm'
>> <quic_llindhol@quicinc.com>; Kinney, Michael D
>> <michael.d.kinney@intel.com>
>> Subject: Re: 回复: [edk2-devel] [PATCH 1/1] Remove bashisms from
>> edksetup.sh and BaseTools/BuildEnv
>>
>> Mike, Liming:
>>
>>
>> Could you merge this please?
>>
>> My understanding is that with the freeze I'm not able to set the push
>> label to merge this myself.
>>
>>
>> On 5/8/23 22:28, Rebecca Cran wrote:
>>> I'd like this to go in for the edk2-stable202305 tag.
>>>
>>>

回复: 回复: [edk2-devel] [PATCH 1/1] Remove bashisms from edksetup.sh and BaseTools/BuildEnv

[gaoliming]

Rebecca:
  I just add push label for this PR. 

Thanks
Liming
> -----邮件原件-----
> 发件人: devel@edk2.groups.io <devel@edk2.groups.io> 代表 Rebecca Cran
> 发送时间: 2023年5月10日 9:02
> 收件人: Kinney, Michael D <michael.d.kinney@intel.com>; Gao, Liming
> <gaoliming@byosoft.com.cn>; devel@edk2.groups.io;
> pedro.falcato@gmail.com
> 抄送: Feng, Bob C <bob.c.feng@intel.com>; Chen, Christine
> <yuwei.chen@intel.com>; 'Andrew Fish' <afish@apple.com>; 'Leif Lindholm'
> <quic_llindhol@quicinc.com>
> 主题: Re: 回复: [edk2-devel] [PATCH 1/1] Remove bashisms from
> edksetup.sh and BaseTools/BuildEnv
> 
> There is now: https://github.com/tianocore/edk2/pull/4303
> 
> 
> --
> 
> Rebecca Cran
> 
> 
> On 5/9/23 18:43, Kinney, Michael D wrote:
> > Is there a PR with Rbs added to commit messages?
> >
> > Mike
> >
> >> -----Original Message-----
> >> From: Rebecca Cran <rebecca@bsdio.com>
> >> Sent: Tuesday, May 9, 2023 5:29 PM
> >> To: Gao, Liming <gaoliming@byosoft.com.cn>; devel@edk2.groups.io;
> >> pedro.falcato@gmail.com
> >> Cc: Feng, Bob C <bob.c.feng@intel.com>; Chen, Christine
> >> <yuwei.chen@intel.com>; 'Andrew Fish' <afish@apple.com>; 'Leif
> Lindholm'
> >> <quic_llindhol@quicinc.com>; Kinney, Michael D
> >> <michael.d.kinney@intel.com>
> >> Subject: Re: 回复: [edk2-devel] [PATCH 1/1] Remove bashisms from
> >> edksetup.sh and BaseTools/BuildEnv
> >>
> >> Mike, Liming:
> >>
> >>
> >> Could you merge this please?
> >>
> >> My understanding is that with the freeze I'm not able to set the push
> >> label to merge this myself.
> >>
> >>
> >> On 5/8/23 22:28, Rebecca Cran wrote:
> >>> I'd like this to go in for the edk2-stable202305 tag.
> >>>
> >>>
> 
> 
> 
>