public inbox for devel@edk2.groups.io
 help / color / mirror / Atom feed
From: "Grant Likely" <grant.likely@arm.com>
To: devel@edk2.groups.io, G Edhaya Chandran <Edhaya.Chandran@arm.com>,
	Barton Gao <gaojie@byosoft.com.cn>
Cc: nd@arm.com, Samer El-Haj-Mahmoud <Samer.El-Haj-Mahmoud@arm.com>,
	Grant Likely <grant.likely@arm.com>,
	Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com>
Subject: [edk2-sct PATCH 1/3] edk2-test: Add support for building extra packages
Date: Thu, 11 Feb 2021 17:46:03 +0000	[thread overview]
Message-ID: <20210211174605.17937-1-grant.likely@arm.com> (raw)

The build.sh script is very useful for setting up the build environment
before calling the package build. Sometimes additional packages are
needed when building the SCT. (e.g., it is useful to build ShellPkg).
Refactor the build code to allow additional DSCs to be added to the
build.

This patch is useful when building a full SCT image that includes the
EDK2 shell.

Signed-off-by: Grant Likely <grant.likely@arm.com>
Cc: G Edhaya Chandran <Edhaya.Chandran@arm.com>
Cc: Barton Gao <gaojie@byosoft.com.cn>
Cc: Samer El-Haj-Mahmoud <samer.el-haj-mahmoud@arm.com>
---
 uefi-sct/SctPkg/build.sh | 34 +++++++++++++---------------------
 1 file changed, 13 insertions(+), 21 deletions(-)

diff --git a/uefi-sct/SctPkg/build.sh b/uefi-sct/SctPkg/build.sh
index 37667711..22cf9667 100755
--- a/uefi-sct/SctPkg/build.sh
+++ b/uefi-sct/SctPkg/build.sh
@@ -249,28 +249,20 @@ mkdir -p $DEST_DIR
 cp $EDK_TOOLS_PATH/Source/C/bin/GenBin $DEST_DIR/GenBin
 
 #
-# Build the SCT package
+# Build the packages needed for the SCT
+# Set $DSC_EXTRA to any extra packages needed for the build
 #
-build -p SctPkg/UEFI/UEFI_SCT.dsc -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_BUILD $3 $4 $5 $6 $7 $8 $9
-
-# Check if there is any error
-status=$?
-if test $status -ne 0
-then
-  echo Could not build the UEFI SCT package
-  exit -1
-fi
-
-build -p SctPkg/UEFI/IHV_SCT.dsc -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_BUILD $3 $4 $5 $6 $7 $8 $9
-
-# Check if there is any error
-status=$?
-if test $status -ne 0
-then
-  echo Could not build the IHV SCT package
-  exit -1
-fi
-
+for DSC in SctPkg/UEFI/UEFI_SCT.dsc SctPkg/UEFI/IHV_SCT.dsc $DSC_EXTRA
+do
+	build -p $DSC -a $SCT_TARGET_ARCH -t $TARGET_TOOLS -b $SCT_BUILD $3 $4 $5 $6 $7 $8 $9
+	# Check if there is any error
+	status=$?
+	if test $status -ne 0
+	then
+		echo Could not build package $DSC
+		exit -1
+	fi
+done
 
 #
 # If the argument is clean, then don't have to generate Sct binary.
-- 
2.20.1


             reply	other threads:[~2021-02-11 17:47 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-02-11 17:46 Grant Likely [this message]
2021-02-11 17:46 ` [edk2-sct PATCH 2/3] edk2-test: use bash 'shift' in build.sh to manage arguments Grant Likely
2021-02-15 11:45   ` G Edhaya Chandran
2021-02-20 16:03   ` Samer El-Haj-Mahmoud
2021-02-22 12:50     ` [edk2-devel] " G Edhaya Chandran
2021-02-11 17:46 ` [edk2-sct PATCH 3/3] edk2-test: Helper script to build SCT+Shell in a bootable format Grant Likely
2021-02-15 12:30   ` G Edhaya Chandran
2021-02-19 18:01     ` Grant Likely
2021-02-19 18:39       ` G Edhaya Chandran
2021-02-22 12:58       ` [edk2-devel] " G Edhaya Chandran
2021-02-20 16:03   ` Samer El-Haj-Mahmoud
2021-02-15 11:43 ` [edk2-sct PATCH 1/3] edk2-test: Add support for building extra packages G Edhaya Chandran
2021-02-20 16:03 ` Samer El-Haj-Mahmoud
2021-02-22 12:17   ` [edk2-devel] " 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=20210211174605.17937-1-grant.likely@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