diff mbox series

tools/docker: Dockerfile: Don't specify dtc submodule

Message ID 20230707220430.1151270-1-trini@konsulko.com
State Accepted
Commit 9b9628b60e2012f2e0c40285d5e1c7a9a2fc3b37
Delegated to: Tom Rini
Headers show
Series tools/docker: Dockerfile: Don't specify dtc submodule | expand

Commit Message

Tom Rini July 7, 2023, 10:04 p.m. UTC
When building qemu, all required submodules (of which we need more than
just dtc) are handled automatically. Currently trying to init the
submodule the way we do results in a git failure.

Reported-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 tools/docker/Dockerfile | 1 -
 1 file changed, 1 deletion(-)

Comments

Simon Glass July 9, 2023, 3:38 a.m. UTC | #1
On Fri, 7 Jul 2023 at 16:04, Tom Rini <trini@konsulko.com> wrote:
>
> When building qemu, all required submodules (of which we need more than
> just dtc) are handled automatically. Currently trying to init the
> submodule the way we do results in a git failure.
>
> Reported-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  tools/docker/Dockerfile | 1 -
>  1 file changed, 1 deletion(-)

Reviewed-by: Simon Glass <sjg@chromium.org>
Tom Rini July 21, 2023, 1:30 a.m. UTC | #2
On Fri, Jul 07, 2023 at 06:04:30PM -0400, Tom Rini wrote:

> When building qemu, all required submodules (of which we need more than
> just dtc) are handled automatically. Currently trying to init the
> submodule the way we do results in a git failure.
> 
> Reported-by: Alexey Brodkin <Alexey.Brodkin@synopsys.com>
> Signed-off-by: Tom Rini <trini@konsulko.com>
> Reviewed-by: Simon Glass <sjg@chromium.org>

Applied to u-boot/master, thanks!
diff mbox series

Patch

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 9804b55ddde7..aa54e2689fb5 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -175,7 +175,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 submodule update --init dtc && \
 	git checkout v6.1.0 && \
 	# config user.name and user.email to make 'git am' happy
 	git config user.name u-boot && \