From: Tom Rini <trini@konsulko.com>
Date: Sun, 8 Dec 2024 17:07:30 +0000 (-0600)
Subject: docker: Prefer the kernelorg toolchains over "root"
X-Git-Tag: v2025.04-rc1~17^2~33^2~2
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9a8736296293cdb473938d15f9efd8c54cb66a9e;p=pandora-u-boot.git

docker: Prefer the kernelorg toolchains over "root"

We should always look in our downloaded toolchains first and then for
host-provided toolchains.

Signed-off-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Simon Glass <sjg@chromium.org>
---

diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile
index 5d77e2b6269..348605a2b6a 100644
--- a/tools/docker/Dockerfile
+++ b/tools/docker/Dockerfile
@@ -318,8 +318,8 @@ RUN virtualenv -p /usr/bin/python3 /tmp/venv && \
 	rm -rf /tmp/venv /tmp/*-requirements.txt
 
 # Create the buildman config file
-RUN /bin/echo -e "[toolchain]\nroot = /usr" > ~/.buildman
-RUN /bin/echo -e "kernelorg = /opt/gcc-${TCVER}-nolibc/*" >> ~/.buildman
+RUN /bin/echo -e "[toolchain]\nkernelorg = /opt/gcc-${TCVER}-nolibc/*" > ~/.buildman
+RUN /bin/echo -e "root = /usr" >> ~/.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