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>
This commit is contained in:
Martin Roth 2022-12-23 21:59:13 -07:00 committed by Felix Singer
parent 265dc1d793
commit 70191da272
1 changed files with 2 additions and 1 deletions

View File

@ -76,11 +76,11 @@ RUN apt-get update && \
python3-jsonschema \ python3-jsonschema \
python3-colorama \ python3-colorama \
python3-pyrsistent \ python3-pyrsistent \
python3-setuptools \
swig \ swig \
&& apt-get clean \ && apt-get clean \
&& pip3 install --upgrade --no-cache-dir pip \ && pip3 install --upgrade --no-cache-dir pip \
&& pip3 install --no-cache-dir \ && pip3 install --no-cache-dir \
setuptools==58.2.0 \
jinja2==3.0.3 \ jinja2==3.0.3 \
recommonmark===0.5.0 \ recommonmark===0.5.0 \
sphinx===1.8.3 \ sphinx===1.8.3 \
@ -89,6 +89,7 @@ RUN apt-get update && \
sphinx_rtd_theme===0.4.2 \ sphinx_rtd_theme===0.4.2 \
&& gem install mdl && gem install mdl
# Build U-boot tools needed by zephyr
RUN mkdir /tmp/b && cd /tmp/b && \ RUN mkdir /tmp/b && cd /tmp/b && \
git clone https://git.kernel.org/pub/scm/utils/dtc/dtc.git dtc && \ 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 && \ git clone https://chromium.googlesource.com/chromiumos/third_party/u-boot -b chromeos-v2020.10-rc1 u-boot && \