Re: [edk2-test][PATCH v1 1/3] uefi-sct/SctPkg: Fix build with latest EDK2

["G Edhaya Chandran" <edhaya.chandran@arm.com>]

Reviewed-by: G Edhaya Chandran<edhaya.chandran@arm.com>


> -----Original Message-----
> From: Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>
> Sent: 24 July 2020 07:59
> To: devel@edk2.groups.io
> Cc: G Edhaya Chandran <Edhaya.Chandran@arm.com>; Eric Jin
> <eric.jin@intel.com>; Irene Park <ipark@nvidia.com>; Heinrich Schuchardt
> <xypron.glpk@gmx.de>
> Subject: [edk2-test][PATCH v1 1/3] uefi-sct/SctPkg: Fix build with latest EDK2
> 
> Update the SctPkg build.sh script to work with latest EDK2, without depending
> on UDK2017. Changes include:
> 
>  - Allowing GCC versions 5+
>  - Refactoring WORKSPACE based on the new EDK2 stuructre
>    (SctPkg is treated as another PACKAGES_PATH component, not a package
>    in the Edk2 folder itself)
>  - Remove unnecessary EdkCompatibilityPkg reference
> 
> This patch depends on the change in
> https://edk2.groups.io/g/devel/message/60407
> 
> Cc: G Edhaya Chandran <Edhaya.Chandran@arm.com>
> Cc: Eric Jin <eric.jin@intel.com>
> Cc: Irene Park <ipark@nvidia.com>
> Cc: Heinrich Schuchardt <xypron.glpk@gmx.de>
> Signed-off-by: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com>
> ---
>  uefi-sct/SctPkg/build.sh | 19 +++++++++++--------
>  1 file changed, 11 insertions(+), 8 deletions(-)
> 
> diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh index
> baf28b40a5f0..d4253cecc7a5 100755
> --- a/uefi-sct/SctPkg/build.sh
> +++ b/uefi-sct/SctPkg/build.sh
> @@ -1,7 +1,7 @@
>  #!/bin/bash
>  #
>  #  Copyright 2006 - 2015 Unified EFI, Inc.<BR> -#  Copyright (c) 2011 - 2019,
> ARM Ltd. All rights reserved.<BR>
> +#  Copyright (c) 2011 - 2020, ARM Ltd. All rights reserved.<BR>
>  #
>  #  This program and the accompanying materials  #  are licensed and made
> available under the terms and conditions of the BSD License @@ -13,7 +13,7
> @@  #  ##
> 
> -SctpackageDependencyList=(EdkCompatibilityPkg SctPkg BaseTools)
> +SctpackageDependencyList=(SctPkg BaseTools)
> 
>  function get_build_arch
>  {
> @@ -55,8 +55,13 @@ function set_cross_compile  function get_gcc_version
> {
>  	gcc_version=$($1 -dumpversion)
> +
> +	if [ "$gcc_version" -gt "5" ]; then
> +		gcc_version="5"
> +	fi
> +
>  	case $gcc_version in
> -		4.6*|4.7*|4.8*|4.9*)
> +		4.6*|4.7*|4.8*|4.9*|5*)
>  			echo GCC$(echo ${gcc_version} | awk -F. '{print $1$2}')
>  			;;
>  		*)
> @@ -122,7 +127,6 @@ do
>  done
> 
>  export EFI_SOURCE=`pwd`
> -export EDK_SOURCE=`pwd`/EdkCompatibilityPkg
> 
>  # check if the last command was successful  status=$?
> @@ -201,14 +205,13 @@ fi
>  #
>  if [ -z "${WORKSPACE:-}" ]; then
>  	echo Initializing workspace
> -	# Uses an external BaseTools project
> -	# Uses the BaseTools in edk2
> -	export EDK_TOOLS_PATH=`pwd`/BaseTools
> +	export WORKSPACE=$PWD
> +	export PACKAGES_PATH=$WORKSPACE/edk2:$WORKSPACE/SctPkg
>  	# We do not pass BuildArmSct.sh arguments to edksetup.sh
>  	while (( "$#" )); do
>  		shift
>  	done
> -	source ./edksetup.sh
> +	. edk2/edksetup.sh
>  else
>  	echo Building from: $WORKSPACE
>  fi
> --
> 2.17.1