From 6e879f3bc4f83d6fce6275afb6273e3a2e0f899a Mon Sep 17 00:00:00 2001 From: DrunkBatya Date: Thu, 2 May 2024 11:59:02 +0300 Subject: [PATCH] Fix openocd --- linux/Dockerfile-aarch64 | 2 +- linux/Dockerfile-x86_64 | 2 +- windows/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/linux/Dockerfile-aarch64 b/linux/Dockerfile-aarch64 index 1da9ba3..acbe1e5 100644 --- a/linux/Dockerfile-aarch64 +++ b/linux/Dockerfile-aarch64 @@ -105,7 +105,7 @@ RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/ RUN mv /toolchain/src/src/hidapi-hidapi-0.14.0 /toolchain/src/src/hidapi RUN git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd -RUN cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3 +RUN bash -c "cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3" ADD scripts/relink.sh /usr/bin/ ADD scripts/build-linux-flipper-tools.sh /toolchain/src/ diff --git a/linux/Dockerfile-x86_64 b/linux/Dockerfile-x86_64 index 5bc412c..05fca79 100644 --- a/linux/Dockerfile-x86_64 +++ b/linux/Dockerfile-x86_64 @@ -105,7 +105,7 @@ RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/ RUN mv /toolchain/src/src/hidapi-hidapi-0.14.0 /toolchain/src/src/hidapi RUN git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd -RUN cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3 +RUN bash -c "cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3" ADD scripts/relink.sh /usr/bin/ ADD scripts/build-linux-flipper-tools.sh /toolchain/src/ diff --git a/windows/Dockerfile b/windows/Dockerfile index a4cbef4..a1f0fe4 100644 --- a/windows/Dockerfile +++ b/windows/Dockerfile @@ -73,7 +73,7 @@ RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/ RUN mv /toolchain/src/src/hidapi-hidapi-0.14.0 /toolchain/src/src/hidapi RUN git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd -RUN cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3 +RUN bash -c "cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3" ADD scripts/build-windows-flipper-tools.sh /toolchain/src/ RUN bash /toolchain/src/build-windows-flipper-tools.sh