From bc3c316f5b09c6b23a13f836a71c612f74031bf4 Mon Sep 17 00:00:00 2001
From: Piet <ptka@mailbox.org>
Date: Mon, 21 Feb 2022 12:29:26 +0100
Subject: [PATCH] ci: Install Rust via RUN. (2nd try)

---
 tools/ci/docker/linux/Dockerfile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile
index 962b54240f..9ef32214d7 100644
--- a/tools/ci/docker/linux/Dockerfile
+++ b/tools/ci/docker/linux/Dockerfile
@@ -191,6 +191,14 @@ RUN cd renesas-tools/source/newlib && \
 RUN cd /tools/renesas-tools/build/gcc && \
   make && make install
 
+# Install Rust and targets supported from NuttX
+ENV CARGO_HOME=/tools/rust
+RUN mkdir -p $CARGO_HOME && \
+  curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \
+  $CARGO_HOME/bin/rustup target add thumbv6m-none-eabi && \
+  $CARGO_HOME/bin/rustup target add thumbv7m-none-eabi
+ENV PATH="$CARGO_HOME/bin:$PATH"
+
 ###############################################################################
 # Final Docker image used for running CI system.  This includes all toolchains
 # supported by the CI system.
@@ -227,7 +235,6 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q
   python3 \
   python3-pip \
   python-is-python3 \
-  rustc \
   u-boot-tools \
   unzip \
   wget \