aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Abraham <thomas.abraham@arm.com>2019-02-22 10:10:02 +0530
committerThomas Abraham <thomas.abraham@arm.com>2019-02-27 10:09:27 +0530
commit661904faed4f54859cdf8728db152f4f32fc6caa (patch)
tree99984e2a082788fe60cb23e3c57417371df8cb38
parent7a5967ab2d72781980851e7934d75af4dfafa50d (diff)
Revert "build-acs: adapt to changes in acs v19.01_REL2.1"
This reverts commit 58ee8a563fce22457d0b2a9254ad5a106a502c71. ACS REL2.1 is not working correctly on Arm's enterprise reference platforms. So use REL1.7 of ACS and keep this patch reverted until issues in REV2.1 are resolved. Change-Id: I0659d5c5361578ca37a551102086296b2193e4d3 Signed-off-by: Thomas Abraham <thomas.abraham@arm.com>
-rwxr-xr-xbuild-acs.sh5
1 files changed, 3 insertions, 2 deletions
diff --git a/build-acs.sh b/build-acs.sh
index 795d07e..509fcdb 100755
--- a/build-acs.sh
+++ b/build-acs.sh
@@ -32,7 +32,7 @@
WS_DIR=`pwd`
ACS_SOURCE_PATH=validation/sys-test/arm-enterprise-acs/
ACS_OUT_PATH=validation/sys-test/arm-enterprise-acs/luv/build
-LUVFILE=$WS_DIR/$ACS_SOURCE_PATH/luvos/scripts/build.sh
+LUVFILE=$WS_DIR/$ACS_SOURCE_PATH/luv/build_luvos.sh
ACS_OUTPUT_FILE=$WS_DIR/$ACS_OUT_PATH/tmp/deploy/images/qemuarm64/luv-live-image-gpt.img
do_clean () {
@@ -59,13 +59,14 @@ do_build () {
else
./acs_sync.sh
fi
+ pushd luv
#luvos build expect to run with umask 022
umask 022
#Build SBSA/SBBR binaries, SBBR (excluding UEFI-SCT)
echo "You must be a member of https://github.com/UEFI/UEFI-SCT for SCT tests"
echo "as your username and password will be required"
echo "skipping the UEFI-SCT tests.."
- ./luvos/scripts/build.sh
+ ./build_luvos.sh
#back to build_dir- popd
popd
else