From: "Samer El-Haj-Mahmoud" <samer.el-haj-mahmoud@arm.com>
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
Date: Thu, 23 Jul 2020 22:28:58 -0400 [thread overview]
Message-ID: <20200724022900.30826-2-Samer.El-Haj-Mahmoud@arm.com> (raw)
In-Reply-To: <20200724022900.30826-1-Samer.El-Haj-Mahmoud@arm.com>
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
next prev parent reply other threads:[~2020-07-24 2:29 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
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 [this message]
2020-08-10 11:56 ` [edk2-test][PATCH v1 1/3] uefi-sct/SctPkg: Fix build " 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
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-list from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200724022900.30826-2-Samer.El-Haj-Mahmoud@arm.com \
--to=devel@edk2.groups.io \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox