[PATCH] Dockerfile: Simplify applying cadence_gem commit to QEMU

[Heinrich Schuchardt]

On 23.04.25 14:44, Michal Simek wrote:
> No reason to call format-patch and then apply it with git am. It is enough
> to cherry-pick it directly like it is done by commit 074bfab54d83 ("CI:
> Cherry-pick reset support for m68k for QEMU").
> 
> Fixes: 50a907edbb2c ("docker: build QEMU v8.2.0")
> Signed-off-by: Michal Simek <michal.simek at amd.com>
> ---
> 
>   tools/docker/Dockerfile | 3 +--
>   1 file changed, 1 insertion(+), 2 deletions(-)
> 
> diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
> index a0fd174ff602..0aa9d3ab3a84 100644
> --- a/tools/docker/Dockerfile
> +++ b/tools/docker/Dockerfile
> @@ -222,8 +222,7 @@ RUN git clone https://gitlab.com/qemu-project/qemu.git /tmp/qemu && \
>   	# config user.name and user.email to make 'git am' happy
>   	git config user.name u-boot && \
>   	git config user.email u-boot at denx.de && \
> -	git format-patch 0c7ffc977195~..0c7ffc977195 && \
> -	git am 0001-hw-net-cadence_gem-Fix-MDIO_OP_xxx-values.patch && \
> +	git cherry-pick 0c7ffc977195 && \
>   	git cherry-pick d3c79c3974 && \
>   	./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 && \

This change looks good but we should move to a newer QEMU version 
instead, see

[PATCH 1/1] Dockerfile: use QEMU 9.2.3
https://lore.kernel.org/u-boot/20250418025743.529973-1-heinrich.schuchardt@canonical.com/

Reviewed-by: Heinrich Schuchardt <xypron.glpk at gmx.de>