diff options
| author | Martin Roth <gaumless@gmail.com> | 2022-12-23 21:59:13 -0700 |
|---|---|---|
| committer | Felix Singer <felixsinger@posteo.net> | 2022-12-25 13:22:13 +0000 |
| commit | 70191da272222217cb208ed0972cf4ddb78881f8 (patch) | |
| tree | 831d17e9f4cda770fdc743b56298a0fd30ac628d | |
| parent | 265dc1d7932606b5041d2b761bf091df71a05ddd (diff) | |
util/docker: Update setuptools to get dtc building
python3-setuptools installed via apt-get is not currently working to
build dtc from git.kernel.org. Falling back to setuptools version
58.2.0 allows it to build again.
The failure message was:
/usr/lib/python3/dist-packages/setuptools/installer.py:27:
SetuptoolsDeprecationWarning: setuptools.installer is deprecated.
Requirements should be satisfied by a PEP 517 installer.
Signed-off-by: Martin Roth <gaumless@gmail.com>
Change-Id: I04cb6d776c3748f9a4b0cfc4ffd4f46458560d3d
Reviewed-on: https://review.coreboot.org/c/coreboot/+/71500
Reviewed-by: Felix Singer <felixsinger@posteo.net>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | util/docker/coreboot-jenkins-node/Dockerfile | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index 4a0c95f839..2fc380daab 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile @@ -76,11 +76,11 @@ RUN apt-get update && \ python3-jsonschema \ python3-colorama \ python3-pyrsistent \ - python3-setuptools \ swig \ && apt-get clean \ && pip3 install --upgrade --no-cache-dir pip \ && pip3 install --no-cache-dir \ + setuptools==58.2.0 \ jinja2==3.0.3 \ recommonmark===0.5.0 \ sphinx===1.8.3 \ @@ -89,6 +89,7 @@ RUN apt-get update && \ sphinx_rtd_theme===0.4.2 \ && gem install mdl +# Build U-boot tools needed by zephyr RUN mkdir /tmp/b && cd /tmp/b && \ git clone https://git.kernel.org/pub/scm/utils/dtc/dtc.git dtc && \ git clone https://chromium.googlesource.com/chromiumos/third_party/u-boot -b chromeos-v2020.10-rc1 u-boot && \ |