Skip to content

Commit

Permalink
Resolve merge conflicts with PR project-chip#4657.
Browse files Browse the repository at this point in the history
  • Loading branch information
Lukasz Gniadzik authored and Filip Jagodzinski committed Mar 24, 2021
1 parent 9128cda commit 1286843
Showing 1 changed file with 1 addition and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ ENV ARM_GCC_INSTALL_ROOT=/opt/ARM-software/gcc-arm-none-eabi-9-2019-q4-major/bin
# ==================================================
RUN set -x \
# Device Tree Compiler 1.4.7
&& curl -o /tmp/dtc.deb https://mirrors.edge.kernel.org/debian/pool/main/d/device-tree-compiler/device-tree-compiler_1.4.7-3_amd64.deb \
&& curl -o /tmp/dtc.deb http://mirrors.edge.kernel.org/ubuntu/pool/main/d/device-tree-compiler/device-tree-compiler_1.4.7-3ubuntu2_amd64.deb \
&& dpkg -i /tmp/dtc.deb \
&& (mkdir -p /opt/nrfconnect/sdk-nrf && cd /opt/nrfconnect/sdk-nrf \
&& pip3 install --no-cache-dir setuptools wheel cmake west \
Expand Down

0 comments on commit 1286843

Please sign in to comment.