aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bionic-amd64-tf-a-build/Dockerfile1
-rwxr-xr-xbionic-amd64-tf-a-build/tf-dependencies.install8
-rw-r--r--bionic-amd64-tf-m-build/requirements_python3.txt1
-rwxr-xr-xcentos8-amd64-flexnet/entrypoint.sh2
4 files changed, 11 insertions, 1 deletions
diff --git a/bionic-amd64-tf-a-build/Dockerfile b/bionic-amd64-tf-a-build/Dockerfile
index ccc855a..3ca894f 100644
--- a/bionic-amd64-tf-a-build/Dockerfile
+++ b/bionic-amd64-tf-a-build/Dockerfile
@@ -23,6 +23,7 @@ ENV PKG_DEPS="\
flex \
g++-multilib \
gcc-multilib \
+ gdisk \
git \
graphviz \
jq \
diff --git a/bionic-amd64-tf-a-build/tf-dependencies.install b/bionic-amd64-tf-a-build/tf-dependencies.install
index 7d1bf04..473bdab 100755
--- a/bionic-amd64-tf-a-build/tf-dependencies.install
+++ b/bionic-amd64-tf-a-build/tf-dependencies.install
@@ -21,11 +21,17 @@ curl --connect-timeout 5 --retry 5 --retry-delay 1 --create-dirs -fsSLo /tmp/cma
https://github.com/Kitware/CMake/releases/download/v3.15.7/cmake-3.15.7-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)
+# Install Arm GCC toolchain (arm-none-eabi GNU-A)
curl --connect-timeout 5 --retry 5 --retry-delay 1 --create-dirs -fsSLo /tmp/gcc-arm-x86_64-arm-none-eabi.tar.xz \
https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-2020.11/binrel/gcc-arm-10.2-2020.11-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 (arm-none-eabi GNU-RM)
+curl --connect-timeout 5 --retry 5 --retry-delay 1 --create-dirs -fsSLo /tmp/gcc-arm-x86_64-arm-none-eabi.tar.bz2 \
+ https://developer.arm.com/-/media/Files/downloads/gnu-rm/10-2020q4/gcc-arm-none-eabi-10-2020-q4-major-x86_64-linux.tar.bz2
+mkdir -p ${TOOLS_DIR}/gnu-rm
+tar xjf /tmp/gcc-arm-x86_64-arm-none-eabi.tar.bz2 -C ${TOOLS_DIR}/gnu-rm --strip-components=1
+
# Install Arm GCC toolchain (aarch64-none-elf)
curl --connect-timeout 5 --retry 5 --retry-delay 1 --create-dirs -fsSLo /tmp/gcc-arm-x86_64-aarch64-none-elf.tar.xz \
https://developer.arm.com/-/media/Files/downloads/gnu-a/10.2-2020.11/binrel/gcc-arm-10.2-2020.11-x86_64-aarch64-none-elf.tar.xz
diff --git a/bionic-amd64-tf-m-build/requirements_python3.txt b/bionic-amd64-tf-m-build/requirements_python3.txt
index 03a1b20..4f43ff1 100644
--- a/bionic-amd64-tf-m-build/requirements_python3.txt
+++ b/bionic-amd64-tf-m-build/requirements_python3.txt
@@ -8,6 +8,7 @@ pyasn1==0.1.9
m2r==0.2.1
Sphinx==2.0.1
sphinx-rtd-theme==0.4.3
+sphinx-tabs==1.1.13
sphinxcontrib-plantuml==0.15
sphinxcontrib-svg2pdfconverter==1.1.1
xmltodict==0.12.0
diff --git a/centos8-amd64-flexnet/entrypoint.sh b/centos8-amd64-flexnet/entrypoint.sh
index e6fc588..b0f20b1 100755
--- a/centos8-amd64-flexnet/entrypoint.sh
+++ b/centos8-amd64-flexnet/entrypoint.sh
@@ -1,6 +1,8 @@
#!/bin/sh -e
export PATH=$PATH:/opt/flexnetserver/
+export FLEXLM_DIAGNOSTICS=3
+
cd /opt/flexnetserver/ && tar zxvf /var/flexnet/*.tgz
lmutil lmhostid