public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
* [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2
@ 2020-07-24  2:28 Samer El-Haj-Mahmoud
  2020-07-24  2:28 ` [edk2-test][PATCH v1 1/3] uefi-sct/SctPkg: Fix build " Samer El-Haj-Mahmoud
                   ` (3 more replies)
  0 siblings, 4 replies; 10+ messages in thread
From: Samer El-Haj-Mahmoud @ 2020-07-24  2:28 UTC (permalink / raw)
  To: devel

Update the SctPkg build scripts and HowTo to build for AARCH64
with latest EDK2, without depending on UDK2017.

This series depends on the change in:
https://edk2.groups.io/g/devel/message/60407

Samer El-Haj-Mahmoud (3):
  uefi-sct/SctPkg: Fix build with latest EDK2
  uefi-sct/SctPkg: Add build instructions with latest EDK2
  uefi-sct/SctPkg: Remove obsolete version macros

 uefi-sct/SctPkg/UEFI/IHV_SCT.dsc         | 20 +++++++-------
 uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc        | 28 ++++++++++----------
 uefi-sct/HowToBuild/How to build SCT.txt | 15 +++++++++++
 uefi-sct/SctPkg/build.sh                 | 19 +++++++------
 4 files changed, 50 insertions(+), 32 deletions(-)
 create mode 100644 uefi-sct/HowToBuild/How to build SCT.txt

-- 
2.17.1


^ permalink raw reply	[flat|nested] 10+ messages in thread

* [edk2-test][PATCH v1 1/3] uefi-sct/SctPkg: Fix build with latest EDK2
  2020-07-24  2:28 [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2 Samer El-Haj-Mahmoud
@ 2020-07-24  2:28 ` Samer El-Haj-Mahmoud
  2020-08-10 11:56   ` G Edhaya Chandran
  2020-07-24  2:28 ` [edk2-test][PATCH v1 2/3] uefi-sct/SctPkg: Add build instructions " Samer El-Haj-Mahmoud
                   ` (2 subsequent siblings)
  3 siblings, 1 reply; 10+ messages in thread
From: Samer El-Haj-Mahmoud @ 2020-07-24  2:28 UTC (permalink / raw)
  To: devel; +Cc: G Edhaya Chandran, Eric Jin, Irene Park, Heinrich Schuchardt

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


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [edk2-test][PATCH v1 2/3] uefi-sct/SctPkg: Add build instructions with latest EDK2
  2020-07-24  2:28 [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2 Samer El-Haj-Mahmoud
  2020-07-24  2:28 ` [edk2-test][PATCH v1 1/3] uefi-sct/SctPkg: Fix build " Samer El-Haj-Mahmoud
@ 2020-07-24  2:28 ` Samer El-Haj-Mahmoud
  2020-08-11 18:49   ` [edk2-devel] " G Edhaya Chandran
  2020-07-24  2:29 ` [edk2-test][PATCH v1 3/3] uefi-sct/SctPkg: Remove obsolete version macros Samer El-Haj-Mahmoud
  2020-08-11 18:44 ` [edk2-devel] [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2 G Edhaya Chandran
  3 siblings, 1 reply; 10+ messages in thread
From: Samer El-Haj-Mahmoud @ 2020-07-24  2:28 UTC (permalink / raw)
  To: devel; +Cc: G Edhaya Chandran, Eric Jin, Irene Park, Heinrich Schuchardt

Add new HowToBuild instructions with latest EDK2, for AARCH64 Linux.
Tested with WSL on Windows 10 Build 19041

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/HowToBuild/How to build SCT.txt | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/uefi-sct/HowToBuild/How to build SCT.txt b/uefi-sct/HowToBuild/How to build SCT.txt
new file mode 100644
index 000000000000..72a87f19022c
--- /dev/null
+++ b/uefi-sct/HowToBuild/How to build SCT.txt	
@@ -0,0 +1,15 @@
+================================================================================
+                                 HOW TO BUILD
+================================================================================
+
+Build Instructions for UEFI SCTII AARCH64 (Linux)
+
+Pre-requisite: install required tools. For example, on WSL running Ubuntu:
+$ sudo apt-get install build-essential uuid-dev python3-distutils gcc-aarch64-linux-gnu
+
+   1) mkdir "sct_workspace"
+   2) cd sct_workspace
+   3) git clone https://github.com/tianocore/edk2-test.git
+   4) git clone --recursive https://github.com/tianocore/edk2.git
+   5) ln -s edk2-test/uefi-sct/SctPkg/ SctPkg
+   6) SctPkg/build.sh AARCH64 GCC RELEASE
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [edk2-test][PATCH v1 3/3] uefi-sct/SctPkg: Remove obsolete version macros
  2020-07-24  2:28 [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2 Samer El-Haj-Mahmoud
  2020-07-24  2:28 ` [edk2-test][PATCH v1 1/3] uefi-sct/SctPkg: Fix build " Samer El-Haj-Mahmoud
  2020-07-24  2:28 ` [edk2-test][PATCH v1 2/3] uefi-sct/SctPkg: Add build instructions " Samer El-Haj-Mahmoud
@ 2020-07-24  2:29 ` Samer El-Haj-Mahmoud
  2020-08-11 18:50   ` [edk2-devel] " G Edhaya Chandran
  2020-08-11 18:44 ` [edk2-devel] [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2 G Edhaya Chandran
  3 siblings, 1 reply; 10+ messages in thread
From: Samer El-Haj-Mahmoud @ 2020-07-24  2:29 UTC (permalink / raw)
  To: devel; +Cc: G Edhaya Chandran, Eric Jin, Irene Park, Heinrich Schuchardt

Remove the obsolete EFI_SPECIFICATION_VERSION and
TIANO_RELEASE_VERSION macros, which are not passed in as command line
arguments anymore.

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/UEFI/IHV_SCT.dsc  | 20 +++++++-------
 uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc | 28 ++++++++++----------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
index 6904dbe89bac..b9dba02e1748 100644
--- a/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
+++ b/uefi-sct/SctPkg/UEFI/IHV_SCT.dsc
@@ -56,25 +56,25 @@
   0|DEFAULT              # The entry: 0|DEFAULT is reserved and always required.
 
 [BuildOptions]
-  MSFT:*_*_IA32_CC_FLAGS    = /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32 /wd4133 /Od
+  MSFT:*_*_IA32_CC_FLAGS    = /D EFI32 /wd4133 /Od
   MSFT:*_*_IA32_ASM_FLAGS   = /DEFI32
-  MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
-  MSFT:*_*_IA32_APP_FLAGS   = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
-  MSFT:*_*_IA32_PP_FLAGS    = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
+  MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI32
+  MSFT:*_*_IA32_APP_FLAGS   = /D EFI32
+  MSFT:*_*_IA32_PP_FLAGS    = /D EFI32
 
-  MSFT:*_*_X64_CC_FLAGS    = /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64 /wd4133 /Od
+  MSFT:*_*_X64_CC_FLAGS    = /D EFIX64 /wd4133 /Od
   MSFT:*_*_X64_ASM_FLAGS   = /DEFIX64
-  MSFT:*_*_X64_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64
-  MSFT:*_*_X64_APP_FLAGS   = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64
-  MSFT:*_*_X64_PP_FLAGS    = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64
+  MSFT:*_*_X64_VFRPP_FLAGS = /D EFIX64
+  MSFT:*_*_X64_APP_FLAGS   = /D EFIX64
+  MSFT:*_*_X64_PP_FLAGS    = /D EFIX64
 
-#  GCC:*_*_IA32_CC_FLAGS     = -D EFI32 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -DEFI_SPECIFICATION_VERSION=0x00020028 -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m32 -mabi=ms -D MDE_CPU_X32
+#  GCC:*_*_IA32_CC_FLAGS     = -D EFI32 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m32 -mabi=ms -D MDE_CPU_X32
    GCC:*_*_IA32_CC_FLAGS     = -D EFIX64 $(GCC_VER_MACRO) -Wno-error 
 #  GCC:*_*_IA32_VFRPP_FLAGS  = -D EFI32 $(GCC_VER_MACRO)
 #  GCC:*_*_IA32_APP_FLAGS    = -D EFI32 $(GCC_VER_MACRO)
 #  GCC:*_*_IA32_PP_FLAGS     = -D EFI32 $(GCC_VER_MACRO)
 
-#  GCC:*_*_X64_CC_FLAGS     = -D EFIX64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -DEFI_SPECIFICATION_VERSION=0x00020028 -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m64 -mcmodel=large -mabi=ms -D MDE_CPU_X64
+#  GCC:*_*_X64_CC_FLAGS     = -D EFIX64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m64 -mcmodel=large -mabi=ms -D MDE_CPU_X64
 
    GCC:*_*_X64_CC_FLAGS     = -D EFIX64 $(GCC_VER_MACRO) -Wno-error 
 #  GCC:*_*_X64_VFRPP_FLAGS  = -D EFIX64 $(GCC_VER_MACRO)
diff --git a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
index eebed7507184..cc8ff4a65a78 100644
--- a/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
+++ b/uefi-sct/SctPkg/UEFI/UEFI_SCT.dsc
@@ -46,8 +46,8 @@
   BUILD_TARGETS                  = DEBUG|RELEASE
   SKUID_IDENTIFIER               = DEFAULT
   
-  DEFINE GCC_VER_MACRO           = -D EFI_SPECIFICATION_VERSION=0x00020028 -D TIANO_RELEASE_VERSION=0x00080006  
-  DEFINE MSFT_VER_MACRO          = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006  
+  DEFINE GCC_VER_MACRO           =
+  DEFINE MSFT_VER_MACRO          =
 
 
 ################################################################################
@@ -60,25 +60,25 @@
   0|DEFAULT              # The entry: 0|DEFAULT is reserved and always required.
 
 [BuildOptions]
-  MSFT:*_*_IA32_CC_FLAGS    = /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32 /wd4133 /Od
-  MSFT:*_*_IA32_ASM_FLAGS   = /DEFI32
-  MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
-  MSFT:*_*_IA32_APP_FLAGS   = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
-  MSFT:*_*_IA32_PP_FLAGS    = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFI32
+  MSFT:*_*_IA32_CC_FLAGS    = /D EFI32 /wd4133 /Od
+  MSFT:*_*_IA32_ASM_FLAGS   = /D EFI32
+  MSFT:*_*_IA32_VFRPP_FLAGS = /D EFI32
+  MSFT:*_*_IA32_APP_FLAGS   = /D EFI32
+  MSFT:*_*_IA32_PP_FLAGS    = /D EFI32
 
-  MSFT:*_*_X64_CC_FLAGS    = /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64 /wd4133 /Od
-  MSFT:*_*_X64_ASM_FLAGS   = /DEFIX64
-  MSFT:*_*_X64_VFRPP_FLAGS = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64
-  MSFT:*_*_X64_APP_FLAGS   = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64
-  MSFT:*_*_X64_PP_FLAGS    = /D EFI_SPECIFICATION_VERSION=0x00020028 /D TIANO_RELEASE_VERSION=0x00080006 /D EFIX64
+  MSFT:*_*_X64_CC_FLAGS    = /D EFIX64 /wd4133 /Od
+  MSFT:*_*_X64_ASM_FLAGS   = /D EFIX64
+  MSFT:*_*_X64_VFRPP_FLAGS = /D EFIX64
+  MSFT:*_*_X64_APP_FLAGS   = /D EFIX64
+  MSFT:*_*_X64_PP_FLAGS    = /D EFIX64
 
-#  GCC:*_*_IA32_CC_FLAGS     = -D EFI32 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -DEFI_SPECIFICATION_VERSION=0x00020028 -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m32 -mabi=ms -D MDE_CPU_X32
+#  GCC:*_*_IA32_CC_FLAGS     = -D EFI32 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m32 -mabi=ms -D MDE_CPU_X32
   GCC:*_*_IA32_CC_FLAGS     = -D EFIX64 $(GCC_VER_MACRO) -Wno-error 
 #  GCC:*_*_IA32_VFRPP_FLAGS  = -D EFI32 $(GCC_VER_MACRO)
 #  GCC:*_*_IA32_APP_FLAGS    = -D EFI32 $(GCC_VER_MACRO)
 #  GCC:*_*_IA32_PP_FLAGS     = -D EFI32 $(GCC_VER_MACRO)
 
-#  GCC:*_*_X64_CC_FLAGS     = -D EFIX64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -DEFI_SPECIFICATION_VERSION=0x00020028 -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m64 -mcmodel=large -mabi=ms -D MDE_CPU_X64
+#  GCC:*_*_X64_CC_FLAGS     = -D EFIX64 $(GCC_VER_MACRO) -ffreestanding -nostdinc -nostdlib -Wno-error -mno-red-zone -Wno-address -mno-stack-arg-probe "-DEFIAPI=__attribute__((ms_abi))" -m64 -mcmodel=large -mabi=ms -D MDE_CPU_X64
    GCC:*_*_X64_CC_FLAGS     = -D EFIX64 $(GCC_VER_MACRO) -Wno-error 
 #  GCC:*_*_X64_VFRPP_FLAGS  = -D EFIX64 $(GCC_VER_MACRO)
 #  GCC:*_*_X64_APP_FLAGS    = -D EFIX64 $(GCC_VER_MACRO)
-- 
2.17.1


^ permalink raw reply related	[flat|nested] 10+ messages in thread

* Re: [edk2-test][PATCH v1 1/3] uefi-sct/SctPkg: Fix build with latest EDK2
  2020-07-24  2:28 ` [edk2-test][PATCH v1 1/3] uefi-sct/SctPkg: Fix build " Samer El-Haj-Mahmoud
@ 2020-08-10 11:56   ` G Edhaya Chandran
  2020-08-11 18:48     ` [edk2-devel] " G Edhaya Chandran
  0 siblings, 1 reply; 10+ messages in thread
From: G Edhaya Chandran @ 2020-08-10 11:56 UTC (permalink / raw)
  To: Samer El-Haj-Mahmoud, devel@edk2.groups.io
  Cc: Eric Jin, Irene Park, Heinrich Schuchardt, nd

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


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [edk2-devel] [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2
  2020-07-24  2:28 [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2 Samer El-Haj-Mahmoud
                   ` (2 preceding siblings ...)
  2020-07-24  2:29 ` [edk2-test][PATCH v1 3/3] uefi-sct/SctPkg: Remove obsolete version macros Samer El-Haj-Mahmoud
@ 2020-08-11 18:44 ` G Edhaya Chandran
  2020-08-11 18:46   ` G Edhaya Chandran
  3 siblings, 1 reply; 10+ messages in thread
From: G Edhaya Chandran @ 2020-08-11 18:44 UTC (permalink / raw)
  To: Samer El-Haj-Mahmoud, devel

[-- Attachment #1: Type: text/plain, Size: 57 bytes --]

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

[-- Attachment #2: Type: text/html, Size: 63 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [edk2-devel] [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2
  2020-08-11 18:44 ` [edk2-devel] [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2 G Edhaya Chandran
@ 2020-08-11 18:46   ` G Edhaya Chandran
  0 siblings, 0 replies; 10+ messages in thread
From: G Edhaya Chandran @ 2020-08-11 18:46 UTC (permalink / raw)
  To: G Edhaya Chandran, devel

[-- Attachment #1: Type: text/plain, Size: 152 bytes --]

Upstreamed by Commits ID
57280728e277c66d7803592cf071d87a21654d09
fd5996f2d060a090c0d4bb0107a8790221539eb9
5588ebe78620e7ee99bc56a08e964499af52a63b

[-- Attachment #2: Type: text/html, Size: 1484 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [edk2-devel] [edk2-test][PATCH v1 1/3] uefi-sct/SctPkg: Fix build with latest EDK2
  2020-08-10 11:56   ` G Edhaya Chandran
@ 2020-08-11 18:48     ` G Edhaya Chandran
  0 siblings, 0 replies; 10+ messages in thread
From: G Edhaya Chandran @ 2020-08-11 18:48 UTC (permalink / raw)
  To: G Edhaya Chandran, devel

[-- Attachment #1: Type: text/plain, Size: 64 bytes --]

Upstreamed by Commit: 5588ebe78620e7ee99bc56a08e964499af52a63b

[-- Attachment #2: Type: text/html, Size: 507 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [edk2-devel] [edk2-test][PATCH v1 2/3] uefi-sct/SctPkg: Add build instructions with latest EDK2
  2020-07-24  2:28 ` [edk2-test][PATCH v1 2/3] uefi-sct/SctPkg: Add build instructions " Samer El-Haj-Mahmoud
@ 2020-08-11 18:49   ` G Edhaya Chandran
  0 siblings, 0 replies; 10+ messages in thread
From: G Edhaya Chandran @ 2020-08-11 18:49 UTC (permalink / raw)
  To: Samer El-Haj-Mahmoud, devel

[-- Attachment #1: Type: text/plain, Size: 123 bytes --]

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

Upstreamed by Commit: fd5996f2d060a090c0d4bb0107a8790221539eb9

[-- Attachment #2: Type: text/html, Size: 586 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [edk2-devel] [edk2-test][PATCH v1 3/3] uefi-sct/SctPkg: Remove obsolete version macros
  2020-07-24  2:29 ` [edk2-test][PATCH v1 3/3] uefi-sct/SctPkg: Remove obsolete version macros Samer El-Haj-Mahmoud
@ 2020-08-11 18:50   ` G Edhaya Chandran
  0 siblings, 0 replies; 10+ messages in thread
From: G Edhaya Chandran @ 2020-08-11 18:50 UTC (permalink / raw)
  To: Samer El-Haj-Mahmoud, devel

[-- Attachment #1: Type: text/plain, Size: 123 bytes --]

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

Upstreamed by Commit: 57280728e277c66d7803592cf071d87a21654d09

[-- Attachment #2: Type: text/html, Size: 580 bytes --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2020-08-11 18:50 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-07-24  2:28 [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2 Samer El-Haj-Mahmoud
2020-07-24  2:28 ` [edk2-test][PATCH v1 1/3] uefi-sct/SctPkg: Fix build " Samer El-Haj-Mahmoud
2020-08-10 11:56   ` G Edhaya Chandran
2020-08-11 18:48     ` [edk2-devel] " G Edhaya Chandran
2020-07-24  2:28 ` [edk2-test][PATCH v1 2/3] uefi-sct/SctPkg: Add build instructions " Samer El-Haj-Mahmoud
2020-08-11 18:49   ` [edk2-devel] " G Edhaya Chandran
2020-07-24  2:29 ` [edk2-test][PATCH v1 3/3] uefi-sct/SctPkg: Remove obsolete version macros Samer El-Haj-Mahmoud
2020-08-11 18:50   ` [edk2-devel] " G Edhaya Chandran
2020-08-11 18:44 ` [edk2-devel] [edk2-test][PATCH v1 0/3] uefi-sct/SctPkg: Build Aarch64 with latest EDK2 G Edhaya Chandran
2020-08-11 18:46   ` G Edhaya Chandran

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox