diff options
| author | Harald Welte <laforge@osmocom.org> | 2020-12-16 10:34:17 +0100 |
|---|---|---|
| committer | Harald Welte <laforge@osmocom.org> | 2020-12-16 10:54:37 +0100 |
| commit | e05b032db9447925d6d44a5039b610518c53497d (patch) | |
| tree | 5d1a245432db84483a3d8f9c13589acd229b05b3 | |
| parent | 37f3d4594bc5b1ee9296c2fedcbfb250113973da (diff) | |
fpga-build: Make riscv + fpga toolchain version configurable
Change-Id: I8969e383975c673c29169ff5b60229c4a75a499c
| -rw-r--r-- | fpga-build/Dockerfile | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/fpga-build/Dockerfile b/fpga-build/Dockerfile index 9253f73..4056143 100644 --- a/fpga-build/Dockerfile +++ b/fpga-build/Dockerfile @@ -3,15 +3,16 @@ FROM $USER/debian-buster-build MAINTAINER Harald Welte <laforge@gnumonks.org> -ARG TOOLCHAIN_DATE=20200914 +ARG FPGA_TOOLCHAIN_DATE=20200914 +ARG RISCV_TOOLCHAIN_VER=8.3.0-1.2 -RUN wget --quiet https://github.com/open-tool-forge/fpga-toolchain/releases/download/nightly-$TOOLCHAIN_DATE/fpga-toolchain-linux_x86_64-nightly-$TOOLCHAIN_DATE.tar.gz -RUN tar -C /opt -xzf fpga-toolchain-linux_x86_64-nightly-$TOOLCHAIN_DATE.tar.gz && \ - rm fpga-toolchain-linux_x86_64-nightly-$TOOLCHAIN_DATE.tar.gz +RUN wget https://github.com/open-tool-forge/fpga-toolchain/releases/download/nightly-${FPGA_TOOLCHAIN_DATE}/fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz +RUN tar -C /opt -xf fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz && \ + rm fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz -RUN wget --quiet https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/download/v8.3.0-1.2/xpack-riscv-none-embed-gcc-8.3.0-1.2-linux-x64.tar.gz -RUN tar -C /opt -xzvf /xpack-riscv-none-embed-gcc-8.3.0-1.2-linux-x64.tar.gz && \ - rm xpack-riscv-none-embed-gcc-8.3.0-1.2-linux-x64.tar.gz +RUN wget --quiet https://github.com/xpack-dev-tools/riscv-none-embed-gcc-xpack/releases/download/v${RISCV_TOOLCHAIN_VER}/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz +RUN tar -C /opt -xf /xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz && \ + rm xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz RUN apt-get update && \ apt-get upgrade -y && \ @@ -23,4 +24,4 @@ RUN useradd -m osmocom USER osmocom WORKDIR /home/osmocom -ENV PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-8.3.0-1.2/bin:${PATH} +ENV PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}/bin:${PATH} |