diff options
author | Fathi Boudra <fathi.boudra@linaro.org> | 2020-11-11 10:06:36 +0100 |
---|---|---|
committer | Fathi Boudra <fathi.boudra@linaro.org> | 2020-11-11 10:06:36 +0100 |
commit | bb903d95532934ecb0870f300843c6c3b8042059 (patch) | |
tree | 4caf4d49aa28f1b87d94a0cddf69393ae096260d | |
parent | db3446442894c24f57e0a1038325e20d7d4fdde4 (diff) | |
download | dockerfiles-bb903d95532934ecb0870f300843c6c3b8042059.tar.gz |
TF-A: minor cosmetic changes
* Use 2 spaces for the URLs.
* Re-order Clang versions (6.8, 6.13. 10.0)
Signed-off-by: Fathi Boudra <fathi.boudra@linaro.org>
Change-Id: Ib9ce475c71106a771bea2f3be540ac880bcb95d3
-rwxr-xr-x | bionic-amd64-tf-a-build/tf-dependencies.install | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/bionic-amd64-tf-a-build/tf-dependencies.install b/bionic-amd64-tf-a-build/tf-dependencies.install index aedf6f6..c3d0f06 100755 --- a/bionic-amd64-tf-a-build/tf-dependencies.install +++ b/bionic-amd64-tf-a-build/tf-dependencies.install @@ -9,48 +9,49 @@ tar -xf /tmp/cppcheck.tar.gz -C /opt # Install PlantUML curl --create-dirs -fsSLo ${PLANTUML_JAR_PATH} \ -https://repo1.maven.org/maven2/net/sourceforge/plantuml/plantuml/1.2019.6/plantuml-1.2019.6.jar + https://repo1.maven.org/maven2/net/sourceforge/plantuml/plantuml/1.2019.6/plantuml-1.2019.6.jar # Install CMake curl --create-dirs -fsSLo /tmp/cmake-Linux-x86_64.tar.gz \ -https://cmake.org/files/v3.15/cmake-3.15.0-Linux-x86_64.tar.gz + https://cmake.org/files/v3.15/cmake-3.15.0-Linux-x86_64.tar.gz tar -xf /tmp/cmake-Linux-x86_64.tar.gz -C ${TOOLS_DIR} --strip-components=1 # Install Arm GCC toolchain (arm-none-eabi) curl --create-dirs -fsSLo /tmp/gcc-arm-x86_64-arm-none-eabi.tar.xz \ -https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-arm-none-eabi.tar.xz + https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-arm-none-eabi.tar.xz tar -Jxf /tmp/gcc-arm-x86_64-arm-none-eabi.tar.xz -C ${TOOLS_DIR} --strip-components=1 # Install Arm GCC toolchain (aarch64-none-elf) curl --create-dirs -fsSLo /tmp/gcc-arm-x86_64-aarch64-none-elf.tar.xz \ -https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf.tar.xz + https://developer.arm.com/-/media/Files/downloads/gnu-a/9.2-2019.12/binrel/gcc-arm-9.2-2019.12-x86_64-aarch64-none-elf.tar.xz tar -Jxf /tmp/gcc-arm-x86_64-aarch64-none-elf.tar.xz -C ${TOOLS_DIR} --strip-components=1 # Install Linaro GCC 6.2.1 toolchain (aarch64-none-elf), which is required by some platforms, i.e. marvell # NOTE: Toolchain is not available through PATH so to use it, CROSS_COMPILE should point to # CROSS_COMPILE=${TOOLS_DIR}/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu- curl --create-dirs -fsSLo /tmp/gcc-linaro-x86_64_aarch64-linux-gnu.tar.xz \ -https://releases.linaro.org/components/toolchain/binaries/6.2-2016.11/aarch64-linux-gnu/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu.tar.xz + https://releases.linaro.org/components/toolchain/binaries/6.2-2016.11/aarch64-linux-gnu/gcc-linaro-6.2.1-2016.11-x86_64_aarch64-linux-gnu.tar.xz tar -Jxf /tmp/gcc-linaro-x86_64_aarch64-linux-gnu.tar.xz -C ${TOOLS_DIR} -# Install Arm Clang (armclang) -mkdir -p /tmp/armclang -curl --create-dirs -fsSLo /tmp/DS500-BN-00026-r5p0-15rel0.tgz \ -https://developer.arm.com/-/media/Files/downloads/compiler/DS500-BN-00026-r5p0-15rel0.tgz?revision=6a961cf7-1d9a-4664-900b-11d20552dbc7?product=Download%20Arm%20Compiler,64-bit,,Linux,6.13 -tar -xf /tmp/DS500-BN-00026-r5p0-15rel0.tgz -C /tmp/armclang -/tmp/armclang/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR} - # Install Arm Clang 6.8 toolchain (armclang) -# NOTE: Toolchain is not available through PATH so to use it, CC should point to CC=${TOOLS_DIR}/armclang-6.8/bin/armclang +# NOTE: Toolchain is not available through PATH so to use it, CC should point to +# CC=${TOOLS_DIR}/armclang-6.8/bin/armclang mkdir -p /tmp/armclang-6.8 curl --create-dirs -fsSLo /tmp/DS500-BN-00026-r5p0-15rel0.tgz \ - https://developer.arm.com/-/media/Files/downloads/compiler/DS500-BN-00026-r5p0-15rel0.tgz?revision=1f1cb8d5-4d1c-4516-9583-b347f71844f4?product=Arm%20Compiler%206%20Downloads,64-bit,,Linux,6.8 + https://developer.arm.com/-/media/Files/downloads/compiler/DS500-BN-00026-r5p0-15rel0.tgz?revision=1f1cb8d5-4d1c-4516-9583-b347f71844f4?product=Arm%20Compiler%206%20Downloads,64-bit,,Linux,6.8 tar -xf /tmp/DS500-BN-00026-r5p0-15rel0.tgz -C /tmp/armclang-6.8 /tmp/armclang-6.8/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR}/armclang-6.8 -# Install clang toolchain (clang) +# Install Arm Clang 6.13 (armclang) +mkdir -p /tmp/armclang-6.13 +curl --create-dirs -fsSLo /tmp/DS500-BN-00026-r5p0-15rel0.tgz \ + https://developer.arm.com/-/media/Files/downloads/compiler/DS500-BN-00026-r5p0-15rel0.tgz?revision=6a961cf7-1d9a-4664-900b-11d20552dbc7?product=Download%20Arm%20Compiler,64-bit,,Linux,6.13 +tar -xf /tmp/DS500-BN-00026-r5p0-15rel0.tgz -C /tmp/armclang-6.13 +/tmp/armclang-6.13/install_x86_64.sh --no-interactive --i-agree-to-the-contained-eula -d ${TOOLS_DIR} + +# Install LLVM Clang toolchain (clang) curl --create-dirs -fsSLo /tmp/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz \ - https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz + https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.0/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz tar -xf /tmp/clang+llvm-10.0.0-x86_64-linux-gnu-ubuntu-18.04.tar.xz -C ${TOOLS_DIR} --strip-components=1 # Additional binaries required |