On 13 October 2018 at 18:39, Yonghong Zhu <yonghong....@intel.com> wrote:
> Remove the logic that the Python3 version must larger than 3.6.
> We verified Python3 migration patches on version 3.6 and 3.7.
> for other version we not verified it.
>
> Cc: Ard Biesheuvel <ard.biesheu...@linaro.org>
> Cc: Leif Lindholm <leif.lindh...@linaro.org>
> Contributed-under: TianoCore Contribution Agreement 1.1
> Signed-off-by: Yonghong Zhu <yonghong....@intel.com>

I will note that this does not solve Andrew's problem, but nonetheless:

Reviewed-by: Ard Biesheuvel <ard.biesheu...@linaro.org>
Tested-by: Ard Biesheuvel <ard.biesheu...@linaro.org>

> ---
>  BaseTools/toolsetup.bat | 7 -------
>  edksetup.sh             | 4 ++--
>  2 files changed, 2 insertions(+), 9 deletions(-)
>
> diff --git a/BaseTools/toolsetup.bat b/BaseTools/toolsetup.bat
> index 0d4028d..d585431 100755
> --- a/BaseTools/toolsetup.bat
> +++ b/BaseTools/toolsetup.bat
> @@ -314,17 +314,10 @@ set PYTHON3=py -3
>       echo.
>       echo !!! ERROR !!!  %PYTHON3% not install.
>       echo.
>       goto end
>     )
> -  FOR /F "TOKENS=1,2" %%i IN ('%PYTHON3% --version') DO set VERSION=%%j
> -  if /I "%VERSION%" LSS "3.6" (
> -     echo.
> -     echo !!! ERROR !!!  python version should greater than or equal to 
> version 3.6.
> -     echo.
> -     goto end
> -  )
>
>  :check_freezer_path
>    @REM We have Python, now test for FreezePython application
>    if not defined PYTHON_FREEZER_PATH (
>      echo.
> diff --git a/edksetup.sh b/edksetup.sh
> index d4e577e..84b3e63 100755
> --- a/edksetup.sh
> +++ b/edksetup.sh
> @@ -129,13 +129,13 @@ function SetupPython3()
>      if [ "$ret" -eq 1 ]; then
>        origin_version=$python_version
>        export PYTHON3=$python
>      fi
>    done
> -  if [ -z "$origin_version" ] || [ `echo "$origin_version < 3.6" |bc` -eq 1 
> ]; then
> +  if [ -z "$origin_version" ]; then
>      echo
> -    echo ERROR!!!, python version should greater than or equal to version 
> 3.6.
> +    echo ERROR!!!, Please install a Python 3 Tool.
>      echo
>      return 1
>    fi
>
>
> --
> 2.6.1.windows.1
>
_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel

Reply via email to