| Message ID | 20240204191357.178510-1-heinrich.schuchardt@canonical.com |
|---|---|
| State | Deferred |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | [1/1] docker: build QEMU v8.2.1 | expand |
On Sun, Feb 04, 2024 at 08:13:57PM +0100, Heinrich Schuchardt wrote: > Upgrade the used QEMU to v8.2.1. This avoids patching the source. > > Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> > --- > tools/docker/Dockerfile | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile > index 6122776bc6..7df68d9c9c 100644 > --- a/tools/docker/Dockerfile > +++ b/tools/docker/Dockerfile > @@ -178,12 +178,10 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ > > RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ > cd /tmp/qemu && \ > - git checkout v8.2.0 && \ > + git checkout v8.2.1 && \ > # 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 && \ > - git format-patch 0c7ffc977195~..0c7ffc977195 && \ > - git am 0001-hw-net-cadence_gem-Fix-MDIO_OP_xxx-values.patch && \ > ./configure --prefix=/opt/qemu --target-list="aarch64-softmmu,arm-softmmu,i386-softmmu,m68k-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 Is there anything else here we're gaining of note? It's not a problem to cherry-pick out commits (and something we need from time to time anyhow).
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 6122776bc6..7df68d9c9c 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -178,12 +178,10 @@ RUN git clone git://git.savannah.gnu.org/grub.git /tmp/grub && \ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \ cd /tmp/qemu && \ - git checkout v8.2.0 && \ + git checkout v8.2.1 && \ # 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 && \ - git format-patch 0c7ffc977195~..0c7ffc977195 && \ - git am 0001-hw-net-cadence_gem-Fix-MDIO_OP_xxx-values.patch && \ ./configure --prefix=/opt/qemu --target-list="aarch64-softmmu,arm-softmmu,i386-softmmu,m68k-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
Upgrade the used QEMU to v8.2.1. This avoids patching the source. Signed-off-by: Heinrich Schuchardt <heinrich.schuchardt@canonical.com> --- tools/docker/Dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)