diff options
| author | Tom Rini <[email protected]> | 2021-10-15 07:50:59 -0400 |
|---|---|---|
| committer | Tom Rini <[email protected]> | 2021-10-15 07:50:59 -0400 |
| commit | 2d34be0a9e12cf050de39ad95375213f48e685bd (patch) | |
| tree | eec9902ce120d15c0868a9024e2c9e4adc947132 /tools | |
| parent | 10cd8efe1a7eacd63907ba95bd8442bc2cdce461 (diff) | |
| parent | 35b2b5f04c71efb73ec0f1a01535542e4b602e15 (diff) | |
Merge branch '2021-10-14-assorted-updates'
- Update to LLVM-13 in CI, assorted PCI fixes and pytest in CI
improvements
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/docker/Dockerfile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 92113dcb72f..1a44423d77b 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -2,7 +2,7 @@ # This Dockerfile is used to build an image containing basic stuff to be used # to build U-Boot and run our test suites. -FROM ubuntu:focal-20210827 +FROM ubuntu:focal-20210921 MAINTAINER Tom Rini <[email protected]> LABEL Description=" This image is for building U-Boot inside a container" @@ -12,7 +12,7 @@ ENV DEBIAN_FRONTEND=noninteractive # Add LLVM repository RUN apt-get update && apt-get install -y gnupg2 wget xz-utils && rm -rf /var/lib/apt/lists/* RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - -RUN echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal-12 main | tee /etc/apt/sources.list.d/llvm.list +RUN echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal-13 main | tee /etc/apt/sources.list.d/llvm.list # Manually install the kernel.org "Crosstool" based toolchains for gcc-11.1.0 RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.1.0/x86_64-gcc-11.1.0-nolibc-aarch64-linux.tar.xz | tar -C /opt -xJ @@ -39,7 +39,7 @@ RUN apt-get update && apt-get install -y \ binutils-dev \ bison \ build-essential \ - clang-12 \ + clang-13 \ coreutils \ cpio \ cppcheck \ |