| Message ID | 20240104132817.278079-1-bmeng@tinylab.org |
|---|---|
| State | Deferred |
| Delegated to: | Tom Rini |
| Headers | show |
| Series | tools: docker: Drop the git user name and email configuration | expand |
On Thu, Jan 04, 2024 at 09:28:17PM +0800, Bin Meng wrote: > Since commit b45ab9ca6621 ("CI: Update to QEMU 8.0.3"), the manual > patch applying was removed, hence there is no need to do a git user > name and email configuration. > > Signed-off-by: Bin Meng <bmeng@tinylab.org> > > --- > > tools/docker/Dockerfile | 3 --- > 1 file changed, 3 deletions(-) > > diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile > index c4a2596b48..c12ed0fd9b 100644 > --- a/tools/docker/Dockerfile > +++ b/tools/docker/Dockerfile > @@ -179,9 +179,6 @@ 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.0.3 && \ > - # 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 && \ > ./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 I'll apply this next time I update / respin the images but I hadn't dropped this part just to make the next time we do need to backport a patch easier.
diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index c4a2596b48..c12ed0fd9b 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -179,9 +179,6 @@ 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.0.3 && \ - # 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 && \ ./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
Since commit b45ab9ca6621 ("CI: Update to QEMU 8.0.3"), the manual patch applying was removed, hence there is no need to do a git user name and email configuration. Signed-off-by: Bin Meng <bmeng@tinylab.org> --- tools/docker/Dockerfile | 3 --- 1 file changed, 3 deletions(-)