<p>laforge has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/docker-playground/+/21739">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fpga-build: Make riscv + fpga toolchain version configurable<br><br>Change-Id: I8969e383975c673c29169ff5b60229c4a75a499c<br>---<br>M fpga-build/Dockerfile<br>1 file changed, 9 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/docker-playground refs/changes/39/21739/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/fpga-build/Dockerfile b/fpga-build/Dockerfile</span><br><span>index 9253f73..4056143 100644</span><br><span>--- a/fpga-build/Dockerfile</span><br><span>+++ b/fpga-build/Dockerfile</span><br><span>@@ -3,15 +3,16 @@</span><br><span> </span><br><span> MAINTAINER Harald Welte <laforge@gnumonks.org></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ARG        TOOLCHAIN_DATE=20200914</span><br><span style="color: hsl(120, 100%, 40%);">+ARG    FPGA_TOOLCHAIN_DATE=20200914</span><br><span style="color: hsl(120, 100%, 40%);">+ARG       RISCV_TOOLCHAIN_VER=8.3.0-1.2</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-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</span><br><span style="color: hsl(0, 100%, 40%);">-RUN  tar -C /opt -xzf fpga-toolchain-linux_x86_64-nightly-$TOOLCHAIN_DATE.tar.gz && \</span><br><span style="color: hsl(0, 100%, 40%);">-        rm fpga-toolchain-linux_x86_64-nightly-$TOOLCHAIN_DATE.tar.gz</span><br><span style="color: hsl(120, 100%, 40%);">+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</span><br><span style="color: hsl(120, 100%, 40%);">+RUN  tar -C /opt -xf fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz && \</span><br><span style="color: hsl(120, 100%, 40%);">+        rm fpga-toolchain-linux_x86_64-nightly-${FPGA_TOOLCHAIN_DATE}.tar.xz</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-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</span><br><span style="color: hsl(0, 100%, 40%);">-RUN        tar -C /opt -xzvf /xpack-riscv-none-embed-gcc-8.3.0-1.2-linux-x64.tar.gz && \</span><br><span style="color: hsl(0, 100%, 40%);">-   rm xpack-riscv-none-embed-gcc-8.3.0-1.2-linux-x64.tar.gz</span><br><span style="color: hsl(120, 100%, 40%);">+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</span><br><span style="color: hsl(120, 100%, 40%);">+RUN    tar -C /opt -xf /xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz && \</span><br><span style="color: hsl(120, 100%, 40%);">+      rm xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}-linux-x64.tar.gz</span><br><span> </span><br><span> RUN        apt-get update && \</span><br><span>  apt-get upgrade -y && \</span><br><span>@@ -23,4 +24,4 @@</span><br><span> USER     osmocom</span><br><span> WORKDIR      /home/osmocom</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-ENV    PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-8.3.0-1.2/bin:${PATH}</span><br><span style="color: hsl(120, 100%, 40%);">+ENV PATH=/opt/fpga-toolchain/bin:/opt/xpack-riscv-none-embed-gcc-${RISCV_TOOLCHAIN_VER}/bin:${PATH}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/docker-playground/+/21739">change 21739</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/docker-playground/+/21739"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: docker-playground </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I8969e383975c673c29169ff5b60229c4a75a499c </div>
<div style="display:none"> Gerrit-Change-Number: 21739 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>