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.

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

Conversation

kaspar030
Copy link
Contributor

@kaspar030 kaspar030 commented Feb 3, 2020

This PR switches the (currently not used because it is broken) TI msp430-elf toolchain with the newly created one from https://github.com/RIOT-OS/toolchains/releases.

This currently won't be tested by travis as there's no corresponding code in master.
I tested building with RIOT-OS/RIOT#12457, works fine.

Updates / fixes #91.

@kaspar030 kaspar030 force-pushed the msp430-elf_selfbuilt branch from 421c61f to 86cbacb Compare February 6, 2020 09:11
@kaspar030 kaspar030 requested a review from gschorcht February 6, 2020 09:12
@kaspar030
Copy link
Contributor Author

  • fixed travis, rebased

Copy link
Contributor

@gschorcht gschorcht left a comment

Choose a reason for hiding this comment

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

It makes sense to pull toolchains from a repository which can be kept synchronized with RIOT releases. We should create the same branches as in RIOT to make it clear which Dockerfile is compatible to which RIOT release.

@gschorcht
Copy link
Contributor

Makes PR #82 obsolete, right?

@kaspar030
Copy link
Contributor Author

Makes PR #82 obsolete, right?

Yeah. Building the toolchain alone takes ~25-30min on Travis, so having the build as part of this container build just doesn't work.

@kaspar030 kaspar030 merged commit 8a6925c into RIOT-OS:master Feb 6, 2020
@kaspar030 kaspar030 deleted the msp430-elf_selfbuilt branch February 6, 2020 09:50
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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants