Skip to content

Commit

Permalink
Fix openocd again
Browse files Browse the repository at this point in the history
  • Loading branch information
@drunkbatya
drunkbatya committed May 2, 2024
1 parent 6e879f3 commit c2a9a71
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
5 changes: 3 additions & 2 deletions darwin/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,8 +75,9 @@ RUN mv /toolchain/src/src/libusb-1.0.24 /toolchain/src/src/libusb
ADD https://github.com/libusb/hidapi/archive/refs/tags/hidapi-0.14.0.tar.gz /toolchain/src/src/archives/
RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/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 bash -c "cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"

RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"

ADD scripts/build-mac-flipper-tools.sh /toolchain/src/
RUN bash /toolchain/src/build-mac-flipper-tools.sh
ADD scripts/relink.sh /usr/bin/
Expand Down
3 changes: 1 addition & 2 deletions linux/Dockerfile-aarch64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ ADD https://github.com/libusb/hidapi/archive/refs/tags/hidapi-0.14.0.tar.gz /too
RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/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 bash -c "cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"
RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"

ADD scripts/relink.sh /usr/bin/
ADD scripts/build-linux-flipper-tools.sh /toolchain/src/
Expand Down
3 changes: 1 addition & 2 deletions linux/Dockerfile-x86_64
View file
Original file line number Diff line number Diff line change
Expand Up @@ -104,8 +104,7 @@ ADD https://github.com/libusb/hidapi/archive/refs/tags/hidapi-0.14.0.tar.gz /too
RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/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 bash -c "cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"
RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"

ADD scripts/relink.sh /usr/bin/
ADD scripts/build-linux-flipper-tools.sh /toolchain/src/
Expand Down
3 changes: 1 addition & 2 deletions windows/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ ADD https://github.com/libusb/hidapi/archive/refs/tags/hidapi-0.14.0.tar.gz /too
RUN tar -xvf /toolchain/src/src/archives/hidapi-0.14.0.tar.gz -C /toolchain/src/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 bash -c "cd /toolchain/src/src/openocd && git reset --hard 708504d4b8094d00746df06cecb5fa6e7c2852d3"
RUN bash -c "git clone https://github.com/flipperdevices/openocd.git /toolchain/src/src/openocd && 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
Expand Down

0 comments on commit c2a9a71

Please sign in to comment.