From b1c2102db1774686282474aee3c2dd06df92f175 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Thu, 10 Jun 2021 10:57:36 -0400 Subject: [PATCH] Docker/CI: Update to "focal" and latest build Move us up to being based on Ubuntu 20.04 "focal" and the latest tag from Ubuntu for this release. For this, we make sure that "python" is now python3 but still include python2.7 for the rx51 qemu build as that is very old and does not support python3. Signed-off-by: Tom Rini --- .azure-pipelines.yml | 2 +- .gitlab-ci.yml | 2 +- test/nokia_rx51_test.sh | 2 +- tools/docker/Dockerfile | 20 +++++++++----------- 4 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index 99964be53c..06c4a2ffd0 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:bionic-20200807-02Sep2020 + ci_runner_image: trini/u-boot-gitlab-ci-runner:focal-20210609-01Jul2021 # 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 d072e833a3..94c7333056 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:bionic-20200807-02Sep2020 +image: trini/u-boot-gitlab-ci-runner:focal-20210609-01Jul2021 # We run some tests in different order, to catch some failures quicker. stages: diff --git a/test/nokia_rx51_test.sh b/test/nokia_rx51_test.sh index ee45e8d6dd..ff840c1e6c 100755 --- a/test/nokia_rx51_test.sh +++ b/test/nokia_rx51_test.sh @@ -56,7 +56,7 @@ if ! test -f qemu-system-arm; then test -d qemu-linaro || git clone https://git.linaro.org/qemu/qemu-linaro.git cd qemu-linaro git checkout 8f8d8e0796efe1a6f34cdd83fb798f3c41217ec1 - ./configure --enable-system --target-list=arm-softmmu --disable-sdl --disable-gtk --disable-curses --audio-drv-list= --audio-card-list= --disable-werror --disable-xen --disable-xen-pci-passthrough --disable-brlapi --disable-vnc --disable-curl --disable-slirp --disable-kvm --disable-user --disable-linux-user --disable-bsd-user --disable-guest-base --disable-uuid --disable-vde --disable-linux-aio --disable-cap-ng --disable-attr --disable-blobs --disable-docs --disable-spice --disable-libiscsi --disable-smartcard-nss --disable-usb-redir --disable-guest-agent --disable-seccomp --disable-glusterfs --disable-nptl --disable-fdt + ./configure --enable-system --target-list=arm-softmmu --python=/usr/bin/python2.7 --disable-sdl --disable-gtk --disable-curses --audio-drv-list= --audio-card-list= --disable-werror --disable-xen --disable-xen-pci-passthrough --disable-brlapi --disable-vnc --disable-curl --disable-slirp --disable-kvm --disable-user --disable-linux-user --disable-bsd-user --disable-guest-base --disable-uuid --disable-vde --disable-linux-aio --disable-cap-ng --disable-attr --disable-blobs --disable-docs --disable-spice --disable-libiscsi --disable-smartcard-nss --disable-usb-redir --disable-guest-agent --disable-seccomp --disable-glusterfs --disable-nptl --disable-fdt make -j4 cd .. ln -s qemu-linaro/arm-softmmu/qemu-system-arm . diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 579df82b56..de0c6cee8c 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:bionic-20200807 +FROM ubuntu:focal-20210609 MAINTAINER Tom Rini 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/bionic/ llvm-toolchain-bionic-10 main | tee /etc/apt/sources.list.d/llvm.list +RUN echo deb http://apt.llvm.org/focal/ llvm-toolchain-focal-10 main | tee /etc/apt/sources.list.d/llvm.list # Manually install the kernel.org "Crosstool" based toolchains for gcc-7.3 RUN wget -O - https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/9.2.0/x86_64-gcc-9.2.0-nolibc-aarch64-linux.tar.xz | tar -C /opt -xJ @@ -61,11 +61,11 @@ RUN apt-get update && apt-get install -y \ iasl \ imagemagick \ iputils-ping \ + libgit2-dev \ libguestfs-tools \ - libisl15 \ liblz4-tool \ libpixman-1-dev \ - libpython-dev \ + libpython3-dev \ libsdl1.2-dev \ libsdl2-dev \ libssl-dev \ @@ -81,12 +81,13 @@ RUN apt-get update && apt-get install -y \ picocom \ parted \ pkg-config \ - python \ - python-dev \ - python-pip \ - python-virtualenv \ + python-is-python3 \ + python2.7 \ + python3 \ + python3-dev \ python3-pip \ python3-sphinx \ + python3-virtualenv \ rpm2cpio \ sbsigntool \ sloccount \ @@ -106,9 +107,6 @@ RUN chmod +r /boot/vmlinu* # Manually install libmpfr4 for the toolchains RUN wget http://mirrors.kernel.org/ubuntu/pool/main/m/mpfr4/libmpfr4_3.1.4-1_amd64.deb && dpkg -i libmpfr4_3.1.4-1_amd64.deb && rm libmpfr4_3.1.4-1_amd64.deb -# Manually install a new enough version of efitools (must be v1.5.2 or later) -RUN wget http://mirrors.kernel.org/ubuntu/pool/universe/e/efitools/efitools_1.8.1-0ubuntu2_amd64.deb && sudo dpkg -i efitools_1.8.1-0ubuntu2_amd64.deb && rm efitools_1.8.1-0ubuntu2_amd64.deb - # Manually install a new enough version of sbsigntools (must be v0.9.4 or later) RUN git clone https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.git /tmp/sbsigntools && \ cd /tmp/sbsigntools && \ -- 2.39.5