diff options
| author | Tom Rini <trini@konsulko.com> | 2021-10-09 10:02:02 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2021-10-09 10:02:02 -0400 |
| commit | 1cc57c3c5bd477aa2d1814d5c460a50abfb7bb6b (patch) | |
| tree | bab4f4fed8dbe3beb15ee6c579d2f1bb0d0007fb | |
| parent | 94e922c76a0e1fcdead3359e340f53fd0709a963 (diff) | |
| download | u-boot-TEST/move-to-debian-bullseye.zip u-boot-TEST/move-to-debian-bullseye.tar.gz u-boot-TEST/move-to-debian-bullseye.tar.bz2 | |
CI: Move from Ubuntu/Focal to Debian/Bullseye for a base imageTEST/move-to-debian-bullseye
An important factor of CI is that it can be run on the same environment
that developers typically use. A problem with Ubuntu/Focal currently is
that due to some trickiness around the host compiler and GCC_VERSION
Kconfig logic, moveconfig.py can no longer sync defconfigs as we run
defconfig without the cross compiler, because we need that defconfig to
be evaluated to know what cross compiler to use. Since the host
compiler is too old for the arm64 optimized string functions, it is not
asked. When we syncconfig however, we know the cross compiler, it's now
a "new" option and the syncconfig gets stuck. While there's no easy
option to provide a more recent toolchain for Ubuntu/Focal,
Debian/Bullseye ships with gcc-10 and we no longer have this problem.
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | .azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 2 | ||||
| -rw-r--r-- | tools/docker/Dockerfile | 5 |
3 files changed, 4 insertions, 5 deletions
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 53f86f5..ef4da91 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -2,7 +2,7 @@ variables: windows_vm: vs2017-win2016 ubuntu_vm: ubuntu-18.04 macos_vm: macOS-10.15 - ci_runner_image: trini/u-boot-gitlab-ci-runner:focal-20210827-30Sep2021 + ci_runner_image: trini/u-boot-gitlab-ci-runner:bullseye-20210927-08Oct2021 # Add '-u 0' options for Azure pipelines, otherwise we get "permission # denied" error when it tries to "useradd -m -u 1001 vsts_azpcontainer", # since our $(ci_runner_image) user is not root. diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a3e2f0..dd76692 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,7 +2,7 @@ # Grab our configured image. The source for this is found at: # https://source.denx.de/u-boot/gitlab-ci-runner -image: trini/u-boot-gitlab-ci-runner:focal-20210827-30Sep2021 +image: trini/u-boot-gitlab-ci-runner:bullseye-20210927-08Oct2021 # We run some tests in different order, to catch some failures quicker. stages: diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 92113dc..f1e51dc 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 debian:bullseye-20210927 MAINTAINER Tom Rini <trini@konsulko.com> 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/bullseye/ llvm-toolchain-bullseye-12 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 @@ -71,7 +71,6 @@ RUN apt-get update && apt-get install -y \ libssl-dev \ libudev-dev \ libusb-1.0-0-dev \ - linux-image-kvm \ lzma-alone \ lzop \ mount \ |