diff options
author | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:43:08 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2018-01-29 13:44:48 +0100 |
commit | 351a519340d509300c754d0a62771a7f6e38ea4c (patch) | |
tree | d7181ebd455c7081f682bd0c82a988f25e0aa446 /coin/provisioning/common/linux/integrity.sh | |
parent | 3c3d56c0cc3107a0b1d110bc1b61ee2f3cd05a90 (diff) | |
parent | 485244b016172445aa20bd31fb84fec6b7724cf5 (diff) |
Merge remote-tracking branch 'origin/5.10.1' into 5.10
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Change-Id: I218ce5567da7ea383009dca2c04beb974511dfcc
Diffstat (limited to 'coin/provisioning/common/linux/integrity.sh')
-rwxr-xr-x | coin/provisioning/common/linux/integrity.sh | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/coin/provisioning/common/linux/integrity.sh b/coin/provisioning/common/linux/integrity.sh index 0c7234b3..e291358d 100755 --- a/coin/provisioning/common/linux/integrity.sh +++ b/coin/provisioning/common/linux/integrity.sh @@ -36,6 +36,7 @@ # This script installs INTEGRITY source "${BASH_SOURCE%/*}/../unix/InstallFromCompressedFileFromURL.sh" +source "${BASH_SOURCE%/*}/../unix/SetEnvVar.sh" version="11.4.4" PrimaryUrl="http://ci-files01-hki.intra.qt.io/input/integrity/ghs_$version.tar.gz" @@ -46,10 +47,10 @@ appPrefix="" InstallFromCompressedFileFromURL "$PrimaryUrl" "$AltUrl" "$SHA1" "$targetFolder" "$appPrefix" -echo "export INTEGRITY_BSP=platform-cortex-a9" >> ~/.bashrc -echo "export INTEGRITY_PATH=$targetFolder/comp_201654" >> ~/.bashrc -echo "export INTEGRITY_DIR=$targetFolder/int1144" >> ~/.bashrc -echo "export INTEGRITY_GL_INC_DIR=\$INTEGRITY_DIR/INTEGRITY-include/Vivante/sdk/inc" >> ~/.bashrc -echo "export INTEGRITY_GL_LIB_DIR=\$INTEGRITY_DIR/libs/Vivante" >> ~/.bashrc +SetEnvVar "INTEGRITY_BSP" "platform-cortex-a9" +SetEnvVar "INTEGRITY_PATH" "$targetFolder/comp_201654" +SetEnvVar "INTEGRITY_DIR" "$targetFolder/int1144" +SetEnvVar "INTEGRITY_GL_INC_DIR" "\$INTEGRITY_DIR/INTEGRITY-include/Vivante/sdk/inc" +SetEnvVar "INTEGRITY_GL_LIB_DIR" "\$INTEGRITY_DIR/libs/Vivante" echo "INTEGRITY = $version" >> ~/versions.txt |