tools: docker: Bump up QEMU version to 6.1.0

At present U-Boot CI testing is still using QEMU 4.2.0 which is
pretty old. Let's bump up to QEMU 6.1.0.

ninja-build is added as the prerequisite required by QEMU 6.1.0.

Note there is a bug in QEMU 6.1.0 Xilinx Zynq UART emulation codes.
A quick fix [1] was posted on QEMU mailing list but it it too late
for 6.1.0 release. Let's manually apply the bug fix on top of the
v6.1.0 release tag at the time being.

[1] http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2-bmeng.cn@gmail.com/

Signed-off-by: Bin Meng <bmeng.cn@gmail.com>
Reviewed-by: Tom Rini <trini@konsulko.com>

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 42d4b0c91ac88d57fea623b0b0c4f70d564227c7..82312e9324d98be93a648da535dfc96ff8dd242d 100644 (file)
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -76,6 +76,7 @@ RUN apt-get update && apt-get install -y \
        mount \
        mtd-utils \
        mtools \
+       ninja-build \
        openssl \
        picocom \
        parted \
@@ -166,7 +167,12 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \
 RUN git clone git://git.qemu.org/qemu.git /tmp/qemu && \
        cd /tmp/qemu && \
        git submodule update --init dtc && \
-       git checkout v4.2.0 && \
+       git checkout v6.1.0 && \
+       # config user.name and user.email to make 'git am' happy
+       git config user.name u-boot && \
+       git config user.email u-boot@denx.de && \
+       # manually apply the bug fix for QEMU 6.1.0 Xilinx Zynq UART emulation codes
+       wget -O - http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2-bmeng.cn@gmail.com/mbox/ | git am && \
        ./configure --prefix=/opt/qemu --target-list="aarch64-softmmu,arm-softmmu,i386-softmmu,mips-softmmu,mips64-softmmu,mips64el-softmmu,mipsel-softmmu,ppc-softmmu,riscv32-softmmu,riscv64-softmmu,sh4-softmmu,x86_64-softmmu,xtensa-softmmu" && \
        make -j$(nproc) all install && \
        rm -rf /tmp/qemu