Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

msp430-elf: switch to RIOT-OS/toolchains 9.2.0-9 #99

Merged
merged 1 commit into from
Feb 6, 2020
Merged

msp430-elf: switch to RIOT-OS/toolchains 9.2.0-9 #99

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 11 additions & 6 deletions Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kaspar030 There is a problem with the PATH variable and the directory extracted from the package. While the sub-directory /opt/riot-toolchain/msp430-elf/9.2.0 doesn't contain the package version in its name, the PATH variable is set to PATH=...:/opt/riot-toolchain/msp430-elf/9.2.0-9. Therefore, msp430-elf-* tools aren't found without setting the PATH variable.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Either we use the PATH with out the package version, or the package generation has to be modified.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the package generation has to be modified.

I'll go with that. The package version should be in there, otherwise updates might "mix" versions when blindly extracting new versions.


# install required python packages from file
# numpy must be already installed before installing some other requirements (emlearn)
Expand Down