TF-M: Venv - Removes legacy support
Removes legacy support for building in default environment and switches
to only using venv, now being built directly from the TF-M dependencies.
Change-Id: I3d81cb8d85c5ec7b9314f5b14bcc7f47cefd4d6d
Signed-off-by: Matthew Dalzell <matthew.dalzell@arm.com>
diff --git a/jammy-amd64-tf-m-build/Dockerfile b/jammy-amd64-tf-m-build/Dockerfile
index da9244d..79947e5 100644
--- a/jammy-amd64-tf-m-build/Dockerfile
+++ b/jammy-amd64-tf-m-build/Dockerfile
@@ -106,19 +106,16 @@
pip2 install --no-cache-dir -r /opt/requirements_python2.txt ;\
# Python3
python3 /tmp/get-pip.py ;\
- pip3 install --no-cache-dir -r /opt/requirements_python3.txt ;\
python3 -m venv /home/buildslave/.venv;\
chown -R buildslave:buildslave /home/buildslave/.venv;\
. /home/buildslave/.venv/bin/activate;\
+ # CI specific packages
pip install /opt/;\
- pip install -r /opt/requirements_python3.txt; \
- # Currently the venv support, and therefore the pyproject.toml file has not
- # been added to TF-M yet, the following is the code which will be used for
- # that, but wil remain dormant until it can be used.
- #git clone "https://review.trustedfirmware.org/TF-M/trusted-firmware-m";\
- #pip install -r ./trusted-firmware-m/pyproject.toml;\
- #pip install trusted-firmware-m/."[docs]";\
- #rm -rf trusted-firmware-m/;\
+ # Packages for building TF-M
+ git clone "https://review.trustedfirmware.org/TF-M/trusted-firmware-m";\
+ pip install /trusted-firmware-m/;\
+ pip install trusted-firmware-m/."[docs]";\
+ rm -rf trusted-firmware-m/;\
# Run shell script(s) to install files, toolchains, etc...
bash -ex /tmp/tf-dependencies.install ;\
bash -ex /tmp/tf-environment.install ;\
diff --git a/jammy-amd64-tf-m-build/requirements_python3.txt b/jammy-amd64-tf-m-build/requirements_python3.txt
deleted file mode 100644
index a81ee4b..0000000
--- a/jammy-amd64-tf-m-build/requirements_python3.txt
+++ /dev/null
@@ -1,26 +0,0 @@
-cbor2==5.4.2.post1
-cryptography==36.0.1
-docutils==0.16
-Jinja2==3.0.3
-MarkupSafe==2.0.1
-PyYAML==6.0
-pycryptodome==3.6.6
-pyasn1==0.4.8
-m2r2==0.3.2
-Sphinx==5.3.0
-sphinx-rtd-theme==1.2.0
-sphinx-tabs==3.4.5
-sphinxcontrib-plantuml==0.24.1
-sphinxcontrib-svg2pdfconverter==1.1.1
-xmltodict==0.12.0
-imgtool==1.9.0
-cysecuretools==4.1.0
-pyhsslms~=2.0.0
-kconfiglib==14.1.0
-networkx>=3.2.1
-tuxsuite==1.38.2
-libclang~=18.1.1
-pyelftools~=0.30
-rich~=13.9.4
-pandas==2.3.1
-numpy==2.2.6