- gcc-11.0 proper is coming soon to kernel.org, use this snapshot for
now to see what fails.
- grub-2.04 does not build with gcc-11.0 due to -Werror, grub-2.06-rc1
fails on riscv32-linux as seen here:
https://www.mail-archive.com/grub-devel@gnu.org/msg30736.html
Cc: Heinrich Schuchardt <xypron.g...@gmx.de>
Signed-off-by: Tom Rini <tr...@konsulko.com>
---
.azure-pipelines.yml | 3 +-
.gitlab-ci.yml | 3 +-
tools/docker/Dockerfile | 74 +++++++++++++++++------------------------
3 files changed, 32 insertions(+), 48 deletions(-)
diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
index 59e99b8894c5..28e4d53ece71 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:bionic-20210416-29Apr2021
# 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.
@@ -312,7 +312,6 @@ jobs:
cp ~/grub_x86.efi ${UBOOT_TRAVIS_BUILD_DIR}/
cp ~/grub_x64.efi ${UBOOT_TRAVIS_BUILD_DIR}/
cp /opt/grub/grubriscv64.efi
${UBOOT_TRAVIS_BUILD_DIR}/grub_riscv64.efi
- cp /opt/grub/grubriscv32.efi
${UBOOT_TRAVIS_BUILD_DIR}/grub_riscv32.efi
cp /opt/grub/grubaa64.efi ${UBOOT_TRAVIS_BUILD_DIR}/grub_arm64.efi
cp /opt/grub/grubarm.efi ${UBOOT_TRAVIS_BUILD_DIR}/grub_arm.efi
virtualenv -p /usr/bin/python3 /tmp/venv
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index bff487404f30..02dc8449ecf9 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:bionic-20210416-29Apr2021
# We run some tests in different order, to catch some failures quicker.
stages:
@@ -38,7 +38,6 @@ stages:
- cp ~/grub_x86.efi $UBOOT_TRAVIS_BUILD_DIR/
- cp ~/grub_x64.efi $UBOOT_TRAVIS_BUILD_DIR/
- cp /opt/grub/grubriscv64.efi $UBOOT_TRAVIS_BUILD_DIR/grub_riscv64.efi
- - cp /opt/grub/grubriscv32.efi $UBOOT_TRAVIS_BUILD_DIR/grub_riscv32.efi
- cp /opt/grub/grubaa64.efi $UBOOT_TRAVIS_BUILD_DIR/grub_arm64.efi
- cp /opt/grub/grubarm.efi $UBOOT_TRAVIS_BUILD_DIR/grub_arm.efi
- virtualenv -p /usr/bin/python3 /tmp/venv
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index d2f0074ee8a6..fb3155b7a28d 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:bionic-20210416
MAINTAINER Tom Rini <tr...@konsulko.com>
LABEL Description=" This image is for building U-Boot inside a container"
@@ -12,20 +12,20 @@ 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/bionic/ llvm-toolchain-bionic-11 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
-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-arm-linux-gnueabi.tar.xz
| tar -C /opt -xJ
-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-i386-linux.tar.xz
| tar -C /opt -xJ
-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-m68k-linux.tar.xz
| tar -C /opt -xJ
-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-mips-linux.tar.xz
| tar -C /opt -xJ
-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-microblaze-linux.tar.xz
| tar -C /opt -xJ
-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-nios2-linux.tar.xz
| tar -C /opt -xJ
-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-powerpc-linux.tar.xz
| tar -C /opt -xJ
-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-riscv32-linux.tar.xz
| tar -C /opt -xJ
-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-riscv64-linux.tar.xz
| tar -C /opt -xJ
-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-sh2-linux.tar.xz
| tar -C /opt -xJ
+RUN wget -O -
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.0.20210426/x86_64-gcc-11.0.20210426-nolibc-aarch64-linux.tar.xz
| tar -C /opt -xJ
+RUN wget -O -
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.0.20210426/x86_64-gcc-11.0.20210426-nolibc-arm-linux-gnueabi.tar.xz
| tar -C /opt -xJ
+RUN wget -O -
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.0.20210426/x86_64-gcc-11.0.20210426-nolibc-i386-linux.tar.xz
| tar -C /opt -xJ
+RUN wget -O -
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.0.20210426/x86_64-gcc-11.0.20210426-nolibc-m68k-linux.tar.xz
| tar -C /opt -xJ
+RUN wget -O -
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.0.20210426/x86_64-gcc-11.0.20210426-nolibc-mips-linux.tar.xz
| tar -C /opt -xJ
+RUN wget -O -
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.0.20210426/x86_64-gcc-11.0.20210426-nolibc-microblaze-linux.tar.xz
| tar -C /opt -xJ
+RUN wget -O -
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.0.20210426/x86_64-gcc-11.0.20210426-nolibc-nios2-linux.tar.xz
| tar -C /opt -xJ
+RUN wget -O -
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.0.20210426/x86_64-gcc-11.0.20210426-nolibc-powerpc-linux.tar.xz
| tar -C /opt -xJ
+RUN wget -O -
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.0.20210426/x86_64-gcc-11.0.20210426-nolibc-riscv32-linux.tar.xz
| tar -C /opt -xJ
+RUN wget -O -
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.0.20210426/x86_64-gcc-11.0.20210426-nolibc-riscv64-linux.tar.xz
| tar -C /opt -xJ
+RUN wget -O -
https://mirrors.edge.kernel.org/pub/tools/crosstool/files/bin/x86_64/11.0.20210426/x86_64-gcc-11.0.20210426-nolibc-sh2-linux.tar.xz
| tar -C /opt -xJ
# Manually install other toolchains
RUN wget -O -
https://github.com/foss-xtensa/toolchain/releases/download/2018.02/x86_64-2018.02-xtensa-dc233c-elf.tar.gz
| tar -C /opt -xz
@@ -118,16 +118,16 @@ RUN git clone
https://git.kernel.org/pub/scm/linux/kernel/git/jejb/sbsigntools.g
# Build GRUB UEFI targets for ARM & RISC-V, 32-bit and 64-bit
RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
cd /tmp/grub && \
- git checkout grub-2.04 && \
+ git checkout grub-2.06-rc1 && \
./bootstrap && \
mkdir -p /opt/grub && \
./configure --target=aarch64 --with-platform=efi \
CC=gcc \
- TARGET_CC=/opt/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc \
-
TARGET_OBJCOPY=/opt/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-objcopy \
-
TARGET_STRIP=/opt/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-strip \
- TARGET_NM=/opt/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-nm \
-
TARGET_RANLIB=/opt/gcc-9.2.0-nolibc/aarch64-linux/bin/aarch64-linux-ranlib && \
+
TARGET_CC=/opt/gcc-11.0.20210426-nolibc/aarch64-linux/bin/aarch64-linux-gcc \
+
TARGET_OBJCOPY=/opt/gcc-11.0.20210426-nolibc/aarch64-linux/bin/aarch64-linux-objcopy
\
+
TARGET_STRIP=/opt/gcc-11.0.20210426-nolibc/aarch64-linux/bin/aarch64-linux-strip
\
+
TARGET_NM=/opt/gcc-11.0.20210426-nolibc/aarch64-linux/bin/aarch64-linux-nm \
+
TARGET_RANLIB=/opt/gcc-11.0.20210426-nolibc/aarch64-linux/bin/aarch64-linux-ranlib
&& \
make && \
./grub-mkimage -O arm64-efi -o /opt/grub/grubaa64.efi --prefix= -d \
grub-core cat chain configfile echo efinet ext2 fat halt help linux \
@@ -137,11 +137,11 @@ RUN git clone git://git.savannah.gnu.org/grub.git
/tmp/grub && \
make clean && \
./configure --target=arm --with-platform=efi \
CC=gcc \
-
TARGET_CC=/opt/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc \
-
TARGET_OBJCOPY=/opt/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-objcopy
\
-
TARGET_STRIP=/opt/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-strip
\
-
TARGET_NM=/opt/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-nm \
-
TARGET_RANLIB=/opt/gcc-9.2.0-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ranlib
&& \
+
TARGET_CC=/opt/gcc-11.0.20210426-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-gcc
\
+
TARGET_OBJCOPY=/opt/gcc-11.0.20210426-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-objcopy
\
+
TARGET_STRIP=/opt/gcc-11.0.20210426-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-strip
\
+
TARGET_NM=/opt/gcc-11.0.20210426-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-nm
\
+
TARGET_RANLIB=/opt/gcc-11.0.20210426-nolibc/arm-linux-gnueabi/bin/arm-linux-gnueabi-ranlib
&& \
make && \
./grub-mkimage -O arm-efi -o /opt/grub/grubarm.efi --prefix= -d \
grub-core cat chain configfile echo efinet ext2 fat halt help linux \
@@ -151,31 +151,17 @@ RUN git clone git://git.savannah.gnu.org/grub.git
/tmp/grub && \
make clean && \
./configure --target=riscv64 --with-platform=efi \
CC=gcc \
- TARGET_CC=/opt/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-gcc \
-
TARGET_OBJCOPY=/opt/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-objcopy \
-
TARGET_STRIP=/opt/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-strip \
- TARGET_NM=/opt/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-nm \
-
TARGET_RANLIB=/opt/gcc-9.2.0-nolibc/riscv64-linux/bin/riscv64-linux-ranlib && \
+
TARGET_CC=/opt/gcc-11.0.20210426-nolibc/riscv64-linux/bin/riscv64-linux-gcc \
+
TARGET_OBJCOPY=/opt/gcc-11.0.20210426-nolibc/riscv64-linux/bin/riscv64-linux-objcopy
\
+
TARGET_STRIP=/opt/gcc-11.0.20210426-nolibc/riscv64-linux/bin/riscv64-linux-strip
\
+
TARGET_NM=/opt/gcc-11.0.20210426-nolibc/riscv64-linux/bin/riscv64-linux-nm \
+
TARGET_RANLIB=/opt/gcc-11.0.20210426-nolibc/riscv64-linux/bin/riscv64-linux-ranlib
&& \
make && \
./grub-mkimage -O riscv64-efi -o /opt/grub/grubriscv64.efi --prefix= -d
\
grub-core cat chain configfile echo efinet ext2 fat halt help linux \
lsefisystab loadenv lvm minicmd normal part_msdos part_gpt reboot \
search search_fs_file search_fs_uuid search_label serial sleep test \
true && \
- make clean && \
- ./configure --target=riscv32 --with-platform=efi \
- CC=gcc \
- TARGET_CC=/opt/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-gcc \
-
TARGET_OBJCOPY=/opt/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-objcopy \
-
TARGET_STRIP=/opt/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-strip \
- TARGET_NM=/opt/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-nm \
-
TARGET_RANLIB=/opt/gcc-9.2.0-nolibc/riscv32-linux/bin/riscv32-linux-ranlib && \
- make && \
- ./grub-mkimage -O riscv32-efi -o /opt/grub/grubriscv32.efi --prefix= -d
\
- grub-core cat chain configfile echo efinet ext2 fat halt help linux \
- lsefisystab loadenv lvm minicmd normal part_msdos part_gpt reboot \
- search search_fs_file search_fs_uuid search_label serial sleep test \
- true && \
rm -rf /tmp/grub
RUN git clone git://git.qemu.org/qemu.git /tmp/qemu && \
@@ -193,7 +179,7 @@ USER uboot:uboot
# Create the buildman config file
RUN /bin/echo -e "[toolchain]\nroot = /usr" > ~/.buildman
-RUN /bin/echo -e "kernelorg = /opt/gcc-9.2.0-nolibc/*" >> ~/.buildman
+RUN /bin/echo -e "kernelorg = /opt/gcc-11.0.20210426-nolibc/*" >> ~/.buildman
RUN /bin/echo -e "arc =
/opt/arc_gnu_2019.09_prebuilt_uclibc_le_archs_linux_install" >> ~/.buildman
RUN /bin/echo -e "\n[toolchain-prefix]\nxtensa =
/opt/2018.02/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman;
RUN /bin/echo -e "\nnds32 =
/opt/nds32le-linux-glibc-v3-upstream/bin/nds32le-linux-" >> ~/.buildman;
--
2.17.1
