| Message ID | 20210825000520.19368-1-bmeng.cn@gmail.com |
|---|---|
| State | Superseded |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/4] tools: docker: Bump up QEMU version to 6.1.0 | expand |
On Wed, Aug 25, 2021 at 08:05:17AM +0800, Bin Meng wrote: > 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. Hence my custom repo is used that contains this > fix on top of the v6.1.0 release tag at the time being. We should > switch to QEMU official repo once the fix is merged in next release. > > [1] http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2-bmeng.cn@gmail.com/ Can we cherry-pick this from upstream? How long is it likely to take before say 6.1.1 is out?
On Wed, Aug 25, 2021 at 10:01 AM Tom Rini <trini@konsulko.com> wrote: > > On Wed, Aug 25, 2021 at 08:05:17AM +0800, Bin Meng wrote: > > > 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. Hence my custom repo is used that contains this > > fix on top of the v6.1.0 release tag at the time being. We should > > switch to QEMU official repo once the fix is merged in next release. > > > > [1] http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2-bmeng.cn@gmail.com/ > > Can we cherry-pick this from upstream? How long is it likely to take > before say 6.1.1 is out? There is probably no 6.1.1 per QEMU release cadence. The fix has not been applied yet, so we cannot cherry pick it up now. If using a custom repo is a problem, how about "wget <patch> from patchwork" and "git am" on top of the official repo? Regards, Bin
On Wed, Aug 25, 2021 at 01:00:46PM +0800, Bin Meng wrote: > On Wed, Aug 25, 2021 at 10:01 AM Tom Rini <trini@konsulko.com> wrote: > > > > On Wed, Aug 25, 2021 at 08:05:17AM +0800, Bin Meng wrote: > > > > > 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. Hence my custom repo is used that contains this > > > fix on top of the v6.1.0 release tag at the time being. We should > > > switch to QEMU official repo once the fix is merged in next release. > > > > > > [1] http://patchwork.ozlabs.org/project/qemu-devel/patch/20210823020813.25192-2-bmeng.cn@gmail.com/ > > > > Can we cherry-pick this from upstream? How long is it likely to take > > before say 6.1.1 is out? > > There is probably no 6.1.1 per QEMU release cadence. The fix has not > been applied yet, so we cannot cherry pick it up now. > > If using a custom repo is a problem, how about "wget <patch> from > patchwork" and "git am" on top of the official repo? Yeah, I think that would be a good alternative.
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 0195456dfe..be6d7dd4dc 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 \ @@ -163,10 +164,10 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ true && \ rm -rf /tmp/grub -RUN git clone git://git.qemu.org/qemu.git /tmp/qemu && \ +RUN git clone https://gitlab.com/lbmeng/qemu.git /tmp/qemu && \ cd /tmp/qemu && \ git submodule update --init dtc && \ - git checkout v4.2.0 && \ + git checkout v6.1.0-u-boot && \ ./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
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. Hence my custom repo is used that contains this fix on top of the v6.1.0 release tag at the time being. We should switch to QEMU official repo once the fix is merged in next release. [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> --- tools/docker/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)