From: Bin Meng <bmeng.cn@gmail.com>
To: Tom Rini <trini@konsulko.com>, u-boot@lists.denx.de
Subject: [PATCH v2 1/4] tools: docker: Bump up QEMU version to 6.1.0
Date: Thu, 26 Aug 2021 23:33:32 +0800 [thread overview]
Message-ID: <20210826153335.27964-1-bmeng.cn@gmail.com> (raw)
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>
---
Changes in v2:
- Use QEMU official git repo, and 'git am' the bug fix manually
tools/docker/Dockerfile | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 0195456dfe..4d7c3c6679 100644
--- 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
--
2.25.1
next reply other threads:[~2021-08-26 15:33 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 15:33 Bin Meng [this message]
2021-08-26 15:33 ` [PATCH v2 2/4] tools: docker: Build and install genimage Bin Meng
2021-08-27 2:54 ` Tom Rini
2021-09-11 18:16 ` Tom Rini
2021-08-26 15:33 ` [PATCH v2 3/4] riscv: sifive: unleashed: Add genimage config files Bin Meng
2021-09-11 18:16 ` Tom Rini
2021-08-26 15:33 ` [PATCH v2 4/4] azure/gitlab: Add tests for SiFive Unleashed board Bin Meng
2021-08-27 2:54 ` Tom Rini
2021-09-11 18:16 ` Tom Rini
2021-08-27 2:54 ` [PATCH v2 1/4] tools: docker: Bump up QEMU version to 6.1.0 Tom Rini
2021-09-11 14:33 ` Bin Meng
2021-09-11 14:35 ` Tom Rini
2021-09-11 18:15 ` Tom Rini
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210826153335.27964-1-bmeng.cn@gmail.com \
--to=bmeng.cn@gmail.com \
--cc=trini@konsulko.com \
--cc=u-boot@lists.denx.de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox