From 86cbacbc74fcc42eaf936da1a2961798c2e52dce Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Mon, 3 Feb 2020 20:23:11 +0100
Subject: [PATCH] msp430-elf: switch to RIOT-OS/toolchains 9.2.0-9

---
 Dockerfile | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e03234f3..eaa2ac0b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -226,12 +226,17 @@ RUN echo 'Installing ESP32 toolchain' >&2 && \
 
 ENV PATH $PATH:/opt/esp/xtensa-esp32-elf/bin
 
-ARG MSP430_URL=https://software-dl.ti.com/msp430/msp430_public_sw/mcu/msp430/MSPGCC/latest/exports
-ARG MSP430_VERSION=8.3.0.16_linux64
-RUN echo 'Installing TI MSP430 ELF toolchain' >&2 && \
-        wget -q ${MSP430_URL}/msp430-gcc-${MSP430_VERSION}.tar.bz2 -O- \
-            | tar -C /opt -xj
-ENV PATH $PATH:/opt/msp430-gcc-${MSP430_VERSION}/bin
+# RIOT toolchains
+ARG RIOT_TOOLCHAIN_GCC_VERSION=9.2.0
+ARG RIOT_TOOLCHAIN_PACKAGE_VERSION=9
+ARG RIOT_TOOLCHAIN_TAG=20200203165626-106c6b8
+ARG RIOT_TOOLCHAIN_GCCPKGVER=${RIOT_TOOLCHAIN_GCC_VERSION}-${RIOT_TOOLCHAIN_PACKAGE_VERSION}
+ARG RIOT_TOOLCHAIN_SUBDIR=${RIOT_TOOLCHAIN_GCCPKGVER}-${RIOT_TOOLCHAIN_TAG}
+
+ARG MSP430_URL=https://github.com/RIOT-OS/toolchains/releases/download/${RIOT_TOOLCHAIN_SUBDIR}/riot-msp430-elf-${RIOT_TOOLCHAIN_GCCPKGVER}.tgz
+RUN echo 'Installing RIOT MSP430 ELF toolchain' >&2 && \
+        wget -q ${MSP430_URL} -O- | tar -C /opt -xz
+ENV PATH $PATH:/opt/riot-toolchain/msp430-elf/${RIOT_TOOLCHAIN_GCCPKGVER}/bin
 
 # install required python packages from file
 # numpy must be already installed before installing some other requirements (emlearn)