diff mbox series

[6/9] docker: Ensure we use the cross toolchain for aarch64 on arm64

Message ID 20241208190741.4192601-7-trini@konsulko.com
State Accepted
Commit a18235dd1a3a63393a096fcd1c288d2499dda91f
Delegated to: Tom Rini
Headers show
Series Enable arm64 host support in Gitlab | expand

Commit Message

Tom Rini Dec. 8, 2024, 5:07 p.m. UTC
We do not want to use the host toolchain for building our platforms in
CI (it is both too old, and would be inconsistent with our CI
practices). To do this we need to set the toolchain-prefix so that we
don't end up guessing "/opt/.../aarch64-linux-aarch64-linux-" as the
prefix.

Link: https://source.denx.de/u-boot/custodians/u-boot-dm/-/issues/32
Signed-off-by: Tom Rini <trini@konsulko.com>
---
 tools/docker/Dockerfile | 3 +++
 1 file changed, 3 insertions(+)

Comments

Simon Glass Dec. 9, 2024, 1:29 p.m. UTC | #1
On Sun, 8 Dec 2024 at 12:09, Tom Rini <trini@konsulko.com> wrote:
>
> We do not want to use the host toolchain for building our platforms in
> CI (it is both too old, and would be inconsistent with our CI
> practices). To do this we need to set the toolchain-prefix so that we
> don't end up guessing "/opt/.../aarch64-linux-aarch64-linux-" as the
> prefix.
>
> Link: https://source.denx.de/u-boot/custodians/u-boot-dm/-/issues/32
> Signed-off-by: Tom Rini <trini@konsulko.com>
> ---
>  tools/docker/Dockerfile | 3 +++
>  1 file changed, 3 insertions(+)
>

Reviewed-by: Simon Glass <sjg@chromium.org>
diff mbox series

Patch

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 38a9c4b9ec69..5d77e2b62696 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -323,6 +323,9 @@  RUN /bin/echo -e "kernelorg = /opt/gcc-${TCVER}-nolibc/*" >> ~/.buildman
 RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then \
         /bin/echo -e "\n[toolchain-prefix]\nxtensa = /opt/2020.07/xtensa-dc233c-elf/bin/xtensa-dc233c-elf-" >> ~/.buildman; \
     fi
+RUN if [ "$TARGETPLATFORM" = "linux/arm64" ]; then \
+        /bin/echo -e "\n[toolchain-prefix]\naarch64 = /opt/gcc-${TCVER}-nolibc/aarch64-linux/bin/aarch64-linux-" >> ~/.buildman; \
+    fi
 RUN /bin/echo -e "\n[toolchain-alias]\nsh = sh2" >> ~/.buildman
 RUN /bin/echo -e "\nx86 = i386" >> ~/.buildman;